diff --git a/Classes.inf b/Classes.inf
index 5a856f0..61fbeec 100644
--- a/Classes.inf
+++ b/Classes.inf
@@ -5,4 +5,19 @@ Class Set
         Examine: return false;
         default: print_ret "You can't do that with ", (the) self, ".";
     ],
-    has scenery;
\ No newline at end of file
+    has scenery;
+
+Class Decoration
+    with before [;
+        Take,Pull,Push,PushDir:
+            print_ret "You can't do that with ", (the) self, ".";
+    ],
+    has static;
+
+Class Furniture
+    class Decoration,
+    with before [;
+        Take,Pull,Push,PushDir:
+            print_ret (the) self, " is too heavy for that.";
+    ],
+    has supporter;
diff --git a/Items.inf b/Items.inf
new file mode 100644
index 0000000..eb0fe6e
--- /dev/null
+++ b/Items.inf
@@ -0,0 +1,4 @@
+Decoration poster "Starfleet recruitment poster" bunk
+    with name 'poster' 'recruitment',
+        description "A poster is attached to the roof of your bunk.^
+          This poster is what inspired you to join Starfleet.";
\ No newline at end of file
diff --git a/Rooms.inf b/Rooms.inf
index 08fb610..1d17ecd 100644
--- a/Rooms.inf
+++ b/Rooms.inf
@@ -1,3 +1,4 @@
+! @todo fix "You stand" when in bunk
 Room lower_decks "Lower Decks Corridor"
     with description "You stand in a lower decks corridor.
                       This corridor contains several bunks
@@ -5,8 +6,8 @@ Room lower_decks "Lower Decks Corridor"
                       sleep.";
 
 ! @todo fix "in the Your bunk"
-Object bunk "Your bunk" lower_decks
-    with name "bunk" "bunks",
+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;
diff --git a/remontel.inf b/remontel.inf
index 21757da..e65d48a 100644
--- a/remontel.inf
+++ b/remontel.inf
@@ -9,6 +9,7 @@ Include "VerbLib";
 Include "Globals.inf";
 Include "Classes.inf";
 Include "Rooms.inf";
+Include "Items.inf";
 
 [ Initialise ;
     location = bunk;