diff --git a/Characters.inf b/Characters.inf
index 8d193bd..a6299dd 100644
--- a/Characters.inf
+++ b/Characters.inf
@@ -1,4 +1,3 @@
-! @todo fix talking to computer when lights are off
 Object computer "Computer"
     with name 'computer' 'ship',
         description "The computer of the ship uses non-sentient artificial intelligence^
diff --git a/Classes.inf b/Classes.inf
index 7475720..489c1ba 100644
--- a/Classes.inf
+++ b/Classes.inf
@@ -1,4 +1,11 @@
-Class Room has light;
+Class Room
+    with add_to_scope [;
+        AddToScope(computer);
+        PlaceInScope(computer);
+        AddToScope(lights);
+        PlaceInScope(lights);
+    ],
+    has light;
 
 ! Class Set
 !     with before [;
diff --git a/MoreVerbs.inf b/MoreVerbs.inf
new file mode 100644
index 0000000..e69de29
diff --git a/remontel.inf b/remontel.inf
index f00ab55..06c9781 100644
--- a/remontel.inf
+++ b/remontel.inf
@@ -28,10 +28,11 @@ Include "Characters.inf";
 Include "Items.inf";
 
 [ Initialise ;
-    location = bunk; ! @todo switch to bunk
+    location = bunk;
     player.description = "You are wearing an operations uniform,
             with a single pip.";
     move computer to bunk;
 ];
 
 Include "Grammar";
+Include "MoreVerbs.inf";
\ No newline at end of file