diff --git a/Assets/Station46/Modules/Laser/Laser Emitter.prefab b/Assets/Station46/Modules/Laser/Laser Emitter.prefab
index e760b39..f0d8a7a 100644
--- a/Assets/Station46/Modules/Laser/Laser Emitter.prefab	
+++ b/Assets/Station46/Modules/Laser/Laser Emitter.prefab	
@@ -105,6 +105,39 @@ BoxCollider:
   serializedVersion: 3
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &3102359450922407050
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8658779252248553235}
+  m_Layer: 0
+  m_Name: Origin
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8658779252248553235
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3102359450922407050}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -0.25}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 5831954408757011522}
+  - {fileID: 2161470782926054222}
+  m_Father: {fileID: 2835502344937141734}
+  m_RootOrder: -1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &7020297526286184566
 GameObject:
   m_ObjectHideFlags: 0
@@ -134,7 +167,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4670783296661506346}
-  m_Father: {fileID: 2835502344937141734}
+  m_Father: {fileID: 8658779252248553235}
   m_RootOrder: -1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &7329942003389928718
@@ -167,10 +200,9 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 5831954408757011522}
-  - {fileID: 2161470782926054222}
+  - {fileID: 8658779252248553235}
   m_Father: {fileID: 0}
-  m_RootOrder: -1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &2394984000857638811
 MonoBehaviour:
@@ -224,13 +256,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8756285610275872068}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -0, y: 0.125, z: 0}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.125, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 2835502344937141734}
-  m_RootOrder: 0
+  m_Father: {fileID: 8658779252248553235}
+  m_RootOrder: -1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!120 &8529185019471240263
 LineRenderer:
diff --git a/Assets/Station46/Modules/Laser/Laser Redirector.prefab b/Assets/Station46/Modules/Laser/Laser Redirector.prefab
index 10fa77d..f79f8e9 100644
--- a/Assets/Station46/Modules/Laser/Laser Redirector.prefab	
+++ b/Assets/Station46/Modules/Laser/Laser Redirector.prefab	
@@ -11,7 +11,6 @@ GameObject:
   - component: {fileID: 1524393306245076783}
   - component: {fileID: 897376356061303010}
   - component: {fileID: 2812559121526871782}
-  - component: {fileID: 7742973117490303454}
   - component: {fileID: 5156043258505205515}
   - component: {fileID: 7231726315279509463}
   m_Layer: 0
@@ -36,7 +35,7 @@ Transform:
   - {fileID: 6130255007532736668}
   - {fileID: 8905692309860668305}
   m_Father: {fileID: 0}
-  m_RootOrder: -1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &897376356061303010
 MonoBehaviour:
@@ -65,21 +64,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4c152de8a63080540ad136a98dd86dc8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &7742973117490303454
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 251845578051121456}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4f534253f30947c3be8ac6e0924a9cde, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  firing: 0
-  laserStart: {fileID: 8905692309860668305}
-  laserLineRenderer: {fileID: 2519225079777001152}
 --- !u!65 &5156043258505205515
 BoxCollider:
   m_ObjectHideFlags: 0
diff --git a/Assets/Station46/Modules/Laser/Laser Sink.prefab b/Assets/Station46/Modules/Laser/Laser Sink.prefab
index 661290b..a3bb687 100644
--- a/Assets/Station46/Modules/Laser/Laser Sink.prefab	
+++ b/Assets/Station46/Modules/Laser/Laser Sink.prefab	
@@ -112,6 +112,38 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4670783296661506346}
+  m_Father: {fileID: 4721832177169651751}
+  m_RootOrder: -1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &7029828462191519530
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4721832177169651751}
+  m_Layer: 0
+  m_Name: Origin
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4721832177169651751
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7029828462191519530}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -0.25}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 2161470782926054222}
   m_Father: {fileID: 2835502344937141734}
   m_RootOrder: -1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -146,9 +178,9 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 2161470782926054222}
+  - {fileID: 4721832177169651751}
   m_Father: {fileID: 0}
-  m_RootOrder: -1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &3450952798919546212
 MonoBehaviour:
@@ -199,4 +231,4 @@ BoxCollider:
   m_Enabled: 1
   serializedVersion: 3
   m_Size: {x: 0.125, y: 0.25, z: 0.125}
-  m_Center: {x: 0, y: 0.125, z: 0}
+  m_Center: {x: 0, y: 0.125, z: -0.25}
diff --git a/Assets/Test Assets/Test Theme.asset b/Assets/Test Assets/Test Theme.asset
index 2a31969..00abdd3 100644
--- a/Assets/Test Assets/Test Theme.asset	
+++ b/Assets/Test Assets/Test Theme.asset	
@@ -12,8 +12,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 28d04249c1c4438da94b524e7d4afff2, type: 3}
   m_Name: Test Theme
   m_EditorClassIdentifier: 
-  minRoomSize: {x: 3, y: 5}
-  playSpace: {x: 3, y: 5}
+  minRoomSize: {x: 2, y: 4}
+  playSpace: {x: 2, y: 4}
   spaceTile: {fileID: 3229991053255736984, guid: b8f192f7cebe686468af6b1a71c4605b,
     type: 3}
   environment: {fileID: 5743657079028767629, guid: 17ecdbaca50efaa4ab503614dfec54a8,
@@ -27,10 +27,9 @@ MonoBehaviour:
   activeColor:
     hdr: {r: 0, g: 4.329412, b: 8, a: 1}
     ldr: {r: 0, g: 0.5401311, b: 1, a: 1}
-  spawnDoor: {fileID: 11400000, guid: 08ce7f3b4a84bf141a6afe8e31e7ca33, type: 2}
+  spawnDoor: {fileID: 11400000, guid: f862612dd70c369448b18bbd8094cb38, type: 2}
   exitDoorTypes:
-  - {fileID: 11400000, guid: 29e2ae36585f4e65966bc9ea2f95ac4a, type: 2}
-  puzzleCount: {x: 24, y: 24}
+  - {fileID: 11400000, guid: 83d6800536b1df14287ff2cd8e0d58ce, type: 2}
+  puzzleCount: {x: 1, y: 1}
   puzzleTypes:
-  - {fileID: 11400000, guid: e4eaf9e12fbdaef4cba9ce99f429d8c5, type: 2}
-  - {fileID: 11400000, guid: 23cf2b6a956b6a745a88334950f088dd, type: 2}
+  - {fileID: 11400000, guid: 1b21332d2a4da2d4d9f8a105d1e24980, type: 2}