diff --git a/includes/Characters.inf b/includes/Characters.inf
index bb98e1f..0dae525 100644
--- a/includes/Characters.inf
+++ b/includes/Characters.inf
@@ -1,6 +1,3 @@
 Include "Computer.inf";
 
-Object lights "Lights"
-    with name 'lights',
-    found_in [; rtrue; ],
-    has static scenery;
\ No newline at end of file
+NPC pirate_leader "Pirate Leader";
diff --git a/includes/Classes.inf b/includes/Classes.inf
index 489c1ba..5a7e9d4 100644
--- a/includes/Classes.inf
+++ b/includes/Classes.inf
@@ -7,12 +7,12 @@ 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 [;
@@ -28,3 +28,5 @@ Class Decoration
 !             print_ret (the) self, " is too heavy for that.";
 !     ],
 !     has supporter;
+
+Class NPC has animate;
\ No newline at end of file
diff --git a/includes/Globals.inf b/includes/Globals.inf
index e69de29..150d128 100644
--- a/includes/Globals.inf
+++ b/includes/Globals.inf
@@ -0,0 +1,8 @@
+Global woke = false;
+
+[ OutOfBed;
+    if (woke) rfalse;
+    woke = true;
+    StopDaemon(red_alert);
+    print "Good morning^";
+];
\ No newline at end of file
diff --git a/includes/Items.inf b/includes/Items.inf
index f0376d0..1aaf2c9 100644
--- a/includes/Items.inf
+++ b/includes/Items.inf
@@ -9,4 +9,9 @@ Decoration poster "Starfleet recruitment poster" bunk
 Decoration red_alert "Red alert"
     with daemon [;
         "A red alert sounds";
-    ];
\ No newline at end of file
+    ];
+
+Set lights "Lights"
+    with name 'lights',
+    found_in [; rtrue; ],
+    has static concealed;
diff --git a/includes/Rooms.inf b/includes/Rooms.inf
index 9c83f7d..59f2576 100644
--- a/includes/Rooms.inf
+++ b/includes/Rooms.inf
@@ -9,6 +9,6 @@ Room bunk "your bunk" lower_decks
       description "Your bunk is like every other bunk on the lower decks.^
            It's barely big enough to fit you. But it's home.",
       after [;
-          Exit: StopDaemon(red_alert);
+          Exit: OutOfBed();
       ],
     has proper enterable container static ~open ~light;