--- a/data/levels/cargo_bay	Sat Sep 07 21:22:35 2013 +0200
+++ b/data/levels/cargo_bay	Sat Sep 07 22:15:04 2013 +0200
@@ -12,40 +12,18 @@
   - 'To HANGAR'
   classname: Note
 - args:
-  - [1150, 1420]
+  - [1145, 1420]
   - cargo_bay
-  - [1150, 1580]
-  - 90
-  classname: Door
-- args:
-  - [1150, 1510]
-  - cargo_bay
-  - [1150, 1350]
+  - [1145, 1580]
   - 90
   classname: Door
 - args:
-  - [1600, 1200]
-  - crew
-  - [110, 1650]
-  - 180
+  - [1145, 1510]
+  - cargo_bay
+  - [1145, 1350]
+  - 90
   classname: Door
 - args:
-  - [1700, 2510]
-  - 'To CREW QUARTERS'
-  classname: Note
-- args:
-  - [200, 400]
-  classname: Box
-- args:
-  - [270, 400]
-  classname: Box
-- args:
-  - [280, 505]
-  classname: Box
-- args:
-  - [220, 700]
-  classname: Box
-- args:
   - [1550, 1500]
   classname: FloorSwitch
   name: light_switch_1
@@ -88,63 +66,101 @@
   - [789, 1913]
   classname: Box
 - args:
-  - [700, 250]
+  - [438, 980]
   classname: Box
 - args:
-  - [1700, 1150]
-  - light_switch_1
+  - [1385, 1220]
+  - light_switch_7
   classname: FloorLight
   name: light
 - args:
-  - [1700, 1250]
+  - [1385, 1309]
   - all_switches
   classname: FloorLight
   name: light2
 - args: [light_switch_1, light_switch_2, light_switch_3, light_switch_4, light_switch_5, light_switch_6]
   classname: puzzle.StateLogicalAndPuzzler
+  name: all_box_switches
+- args:
+  - [1295, 1165]
+  classname: FloorSwitch
+  name: light_switch_7
+- args: [all_box_switches, light_switch_7]
+  classname: puzzle.StateLogicalAndPuzzler
   name: all_switches
+- args:
+  - [1406, 1265]
+  - crew
+  - [110, 1650]
+  - 0
+  - all_switches
+  classname: PuzzleDoor
+  name: switch_door_to_crew_quarters
+- args:
+  - [1345, 1309]
+  - 'To CREW QUARTERS'
+  classname: Note
 lines: []
 polygons:
   1:
-  - [470, 10]
-  - [470, 1330]
-  - [1100, 1330]
-  - [1100, 1420]
+  - [614, 1200]
+  - [902, 1200]
+  - [902, 1200]
+  - [1190, 1200]
+  - [1190, 192]
+  - [1154, 156]
+  - [1118, 192]
+  - [1118, 1056]
+  - [1046, 1128]
+  - [974, 1128]
+  - [902, 1056]
+  - [902, 192]
+  - [866, 156]
+  - [830, 192]
+  - [830, 1056]
+  - [758, 1128]
+  - [686, 1128]
+  - [614, 1056]
+  - [614, 192]
+  - [578, 156]
+  - [542, 192]
+  - [542, 1056]
+  - [470, 1128]
+  - [398, 1128]
+  - [326, 1056]
+  - [326, 912]
+  - [398, 840]
+  - [470, 840]
+  - [470, 120]
+  - [542, 48]
+  - [614, 48]
+  - [686, 120]
+  - [686, 984]
+  - [722, 1020]
+  - [758, 984]
+  - [758, 120]
+  - [830, 48]
+  - [902, 48]
+  - [974, 120]
+  - [974, 984]
+  - [1010, 1020]
+  - [1046, 984]
+  - [1046, 120]
+  - [1118, 48]
+  - [1190, 48]
+  - [1262, 120]
+  - [1262, 1128]
+  - [1334, 1128]
+  - [1334, 1200]
+  - [1406, 1200]
+  - [1406, 1330]
+  - [1190, 1330]
   - [1190, 1420]
-  - [1190, 1330]
-  - [1820, 1330]
-  - [1820, 10]
-  - [470, 10]
-  2:
+  - [1100, 1420]
+  - [1100, 1330]
+  - [470, 1330]
   - [470, 1200]
-  - [758, 1200]
-  - [758, 1200]
-  - [1046, 1200]
-  - [1046, 192]
-  - [1010, 156]
-  - [974, 192]
-  - [974, 1056]
-  - [902, 1128]
-  - [830, 1128]
-  - [758, 1056]
-  - [758, 336]
-  - [614, 336]
-  - [614, 120]
-  - [830, 120]
-  - [830, 120]
-  - [830, 120]
-  - [830, 984]
-  - [866, 1020]
-  - [902, 984]
-  - [902, 120]
-  - [938, 84]
-  - [1082, 84]
-  - [1118, 120]
-  - [1118, 840]
-  - [1190, 840]
-  - [1190, 1]
-  - [470, 1]
-  - [470, 1200]
+  - [614, 1200]
   4:
   - [200, 1600]
   - [560, 1600]