diff --git a/Characters.inf b/Characters.inf
new file mode 100644
index 0000000..c59f2cf
--- /dev/null
+++ b/Characters.inf
@@ -0,0 +1,42 @@
+! @todo fix talking to computer when lights are off
+! @todo fix computer not being in bunk
+Object computer "Computer"
+    with name 'computer' 'ship',
+        description "The computer of the ship uses non-sentient artificial intelligence^
+            It can perform many tasks and answer questions.",
+        found_in [; rtrue; ],
+        orders [loc ;
+            loc = parent(player);
+            SetTo:
+                if (noun == lights && second == 'full') {
+                    give loc light;
+                    print_ret "Lights at full.";
+                }
+                if (noun == lights && (second == 'zero' || second == 'off')) {
+                    give loc ~light;
+                    print_ret "Lights are off.";
+                }
+                print_ret "I do not know how to set ", (the) noun, " to ", (address) second;
+            Open:
+                switch(noun) {
+                    bunk:
+                        give noun open;
+                        print_ret (The) noun, " is open.";
+                }
+            Close:
+                switch(noun) {
+                    bunk:
+                        give noun ~open;
+                        print_ret (The) noun, " is closed.";
+                }
+            Tell:
+                ! @todo fill this out for various things to talk about
+                print_ret "You want me to tell you about ", (string) second;
+            NotUnderstood: print_ret "I do not understand.";
+        ],
+    has animate scenery;
+
+Object lights "Lights"
+    with name 'lights',
+    found_in [; rtrue; ],
+    has static scenery;
\ No newline at end of file
diff --git a/Classes.inf b/Classes.inf
index 61fbeec..7475720 100644
--- a/Classes.inf
+++ b/Classes.inf
@@ -1,11 +1,11 @@
 Class Room has light;
 
-Class Set
-    with before [;
-        Examine: return false;
-        default: print_ret "You can't do that with ", (the) self, ".";
-    ],
-    has scenery;
+! Class Set
+!     with before [;
+!         Examine: return false;
+!         default: print_ret "You can't do that with ", (the) self, ".";
+!     ],
+!     has scenery;
 
 Class Decoration
     with before [;
@@ -14,10 +14,10 @@ Class Decoration
     ],
     has static;
 
-Class Furniture
-    class Decoration,
-    with before [;
-        Take,Pull,Push,PushDir:
-            print_ret (the) self, " is too heavy for that.";
-    ],
-    has supporter;
+! Class Furniture
+!     class Decoration,
+!     with before [;
+!         Take,Pull,Push,PushDir:
+!             print_ret (the) self, " is too heavy for that.";
+!     ],
+!     has supporter;
diff --git a/Rooms.inf b/Rooms.inf
index e570ae0..7fdb8bf 100644
--- a/Rooms.inf
+++ b/Rooms.inf
@@ -10,4 +10,4 @@ Room bunk "Your bunk" lower_decks
     with name 'bunk' 'bunks',
       description "Your bunk is like every other bunk on the lower decks.^
            It's barely big enough to fit you. But it's home.",
-    has enterable container openable;
+    has enterable container static ~open ~light;
diff --git a/remontel.inf b/remontel.inf
index e65d48a..1a3ae96 100644
--- a/remontel.inf
+++ b/remontel.inf
@@ -9,10 +9,11 @@ Include "VerbLib";
 Include "Globals.inf";
 Include "Classes.inf";
 Include "Rooms.inf";
+Include "Characters.inf";
 Include "Items.inf";
 
 [ Initialise ;
-    location = bunk;
+    location = lower_decks; ! @todo switch to bunk
     player.description = "You are wearing an operations uniform,
             with a single pip.";
 ];