diff --git a/Classes.inf b/Classes.inf
new file mode 100644
index 0000000..5a856f0
--- /dev/null
+++ b/Classes.inf
@@ -0,0 +1,8 @@
+Class Room has light;
+
+Class Set
+    with before [;
+        Examine: return false;
+        default: print_ret "You can't do that with ", (the) self, ".";
+    ],
+    has scenery;
\ No newline at end of file
diff --git a/Globals.inf b/Globals.inf
new file mode 100644
index 0000000..e69de29
diff --git a/Rooms.inf b/Rooms.inf
index c40a019..08fb610 100644
--- a/Rooms.inf
+++ b/Rooms.inf
@@ -1,10 +1,12 @@
-Object lower_decks "Lower Decks Corridor"
+Room lower_decks "Lower Decks Corridor"
     with description "You stand in a lower decks corridor.
-                      This corridor contains several bunks lining the walls where the lower deckers sleep."
-    has light;
+                      This corridor contains several bunks
+                      lining the walls where the lower deckers
+                      sleep.";
 
+! @todo fix "in the Your bunk"
 Object 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;
\ No newline at end of file
+    has enterable container openable;
diff --git a/remontel.inf b/remontel.inf
index 0be1d65..21757da 100644
--- a/remontel.inf
+++ b/remontel.inf
@@ -6,10 +6,14 @@ Release 1;
 Include "Parser";
 Include "VerbLib";
 
+Include "Globals.inf";
+Include "Classes.inf";
 Include "Rooms.inf";
 
 [ Initialise ;
     location = bunk;
+    player.description = "You are wearing an operations uniform,
+            with a single pip.";
 ];
 
 Include "Grammar";