diff --git a/mist/TODO b/mist/TODO
index 5ee43187..49009cee 100644
--- a/mist/TODO
+++ b/mist/TODO
@@ -18,17 +18,14 @@ For release 1.0
 
 + STONEY
 	-- Lights out
-		+ somehow have tops of steps have light coming in
-		+ have yellow gem on doors even in dark
-		+ currently if you turn around with doors open
+		+ currently if you turn around from open airlock
 			they aren't blacked out
 
-	-- have lights come on in telescope view
 	-- allow coming at steps from an angle
-	-- hook up compass rose
 	-- if space allows, lighten floor of compass rose when
 		right button pressed
 	-- hook up pump 
+		-- have the bottom blank out and print PUMPING NOISES
 	-- hook up key/trunk puzzle
 
 + CHANNEL
diff --git a/mist/graphics_stoney/doorway2_n.png b/mist/graphics_stoney/doorway2_n.png
index 42c544d6..d93e534f 100644
Binary files a/mist/graphics_stoney/doorway2_n.png and b/mist/graphics_stoney/doorway2_n.png differ
diff --git a/mist/stoney.s b/mist/stoney.s
index 3e376eb7..6b763b9c 100644
--- a/mist/stoney.s
+++ b/mist/stoney.s
@@ -158,8 +158,13 @@ dont_touch_lights:
 	beq	handle_airlock_doorknob
 	cmp	#STONEY_RIGHT_AIRLOCK
 	beq	handle_airlock_doorknob
+	cmp	#STONEY_ARRIVAL
+	beq	handle_exit_tunnel
 
 	bne	not_a_doorway
+handle_exit_tunnel:
+	jsr	draw_exit_tunnel
+	jmp	not_a_doorway
 
 handle_doorway1:
 	jsr	draw_doorway1
diff --git a/mist/stoney_puzzles.s b/mist/stoney_puzzles.s
index 7b1959f5..ac83c456 100644
--- a/mist/stoney_puzzles.s
+++ b/mist/stoney_puzzles.s
@@ -1165,7 +1165,21 @@ lighthouse_beacon_on:
 	sta	telescope_bg13_sprite+10
 	rts
 
+draw_exit_tunnel:
+	lda	DIRECTION
+	cmp	#DIRECTION_S
+	bne	done_doorway
 
+	lda	PUMP_STATE
+	cmp	#DRAINED_EXIT
+	beq	done_doorway
+
+	ldx	#32
+	lda	#<exit_water_list
+	sta	INL
+	lda	#>exit_water_list
+	sta	INH
+	jmp	hlin_list
 
 draw_doorway1:
 	lda	DIRECTION
@@ -1173,13 +1187,26 @@ draw_doorway1:
 	bne	done_doorway
 
 	lda	BATTERY_CHARGE
-	bne	done_doorway
+	bne	doorway1_draw_water
 
+doorway1_draw_dark:
 	ldx	#0
 	lda	#<doorway1_dark_list
 	sta	INL
 	lda	#>doorway1_dark_list
 	sta	INH
+	jsr	hlin_list
+
+doorway1_draw_water:
+	lda	PUMP_STATE
+	cmp	#DRAINED_TUNNELS
+	beq	done_doorway
+
+	ldx	#24
+	lda	#<doorway1_water_list
+	sta	INL
+	lda	#>doorway1_water_list
+	sta	INH
 	jmp	hlin_list
 
 draw_doorway2:
@@ -1188,15 +1215,28 @@ draw_doorway2:
 	bne	done_doorway
 
 	lda	BATTERY_CHARGE
-	bne	done_doorway
-
+	bne	doorway2_draw_water
+doorway2_draw_dark:
 	ldx	#8
 	lda	#<doorway2_dark_list
 	sta	INL
 	lda	#>doorway2_dark_list
 	sta	INH
+	jsr	hlin_list
+
+doorway2_draw_water:
+	lda	PUMP_STATE
+	cmp	#DRAINED_TUNNELS
+	beq	done_doorway
+
+	ldx	#28
+	lda	#<doorway2_water_list
+	sta	INL
+	lda	#>doorway2_water_list
+	sta	INH
 	jmp	hlin_list
 
+
 done_doorway:
 	rts
 
@@ -1292,3 +1332,26 @@ airlock_doorknob_list:
 	.byte	$d0,19,2
 	.byte	$ff,$ff,$ff
 
+	; at 32
+exit_water_list:
+	.byte	$26,19,2
+	.byte	$26,18,4
+	.byte	$26,18,4
+	.byte	$26,17,6
+	.byte	$ff,$ff,$ff
+
+	; at 24
+doorway1_water_list:
+	.byte	$62,17,1
+	.byte	$62,17,2
+	.byte	$62,17,3
+	.byte	$62,17,4
+	.byte	$62,17,5
+	.byte	$ff,$ff,$ff
+
+	; at 28
+doorway2_water_list:
+	.byte	$62,21,2
+	.byte	$62,18,5
+	.byte	$62,17,6
+	.byte	$ff,$ff,$ff