diff --git a/Characters.inf b/Characters.inf
index c59f2cf..8d193bd 100644
--- a/Characters.inf
+++ b/Characters.inf
@@ -1,5 +1,4 @@
 ! @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^
diff --git a/remontel.inf b/remontel.inf
index 1a3ae96..f00ab55 100644
--- a/remontel.inf
+++ b/remontel.inf
@@ -4,7 +4,22 @@ Constant Headline "^A Star Trek fan production^";
 Release 1;
 
 Include "Parser";
+
+Replace PlayerTo;
 Include "VerbLib";
+[ PlayerTo newplace flag;
+    NoteDeparture();
+    move player to newplace;
+    move computer to newplace;
+    while (parent(newplace)) newplace = parent(newplace);
+    location = real_location = newplace;
+    MoveFloatingObjects(); AdjustLight(1);
+    switch (flag) {
+      0:    <Look>;
+      1:    NoteArrival(); ScoreArrival();
+      2:    LookSub(1);
+    }
+];
 
 Include "Globals.inf";
 Include "Classes.inf";
@@ -13,9 +28,10 @@ Include "Characters.inf";
 Include "Items.inf";
 
 [ Initialise ;
-    location = lower_decks; ! @todo switch to bunk
+    location = bunk; ! @todo switch to bunk
     player.description = "You are wearing an operations uniform,
             with a single pip.";
+    move computer to bunk;
 ];
 
 Include "Grammar";