diff --git a/mist/common_defines.inc b/mist/common_defines.inc
index 157476c3..472632b9 100644
--- a/mist/common_defines.inc
+++ b/mist/common_defines.inc
@@ -213,6 +213,9 @@ SELENA_WATER		=	13
 SELENA_TOWER_VIEW	=	14
 SELENA_CHASM_PATH	=	15
 SELENA_CHASM		=	16
+SELENA_CLOCK_PATH	=	17
+SELENA_CLOCK		=	18
+SELENA_CLOCK_CLOSE	=	19
 
 ; Viewer Room
 
diff --git a/mist/graphics_selena/Makefile b/mist/graphics_selena/Makefile
index 3d76c396..110ad834 100644
--- a/mist/graphics_selena/Makefile
+++ b/mist/graphics_selena/Makefile
@@ -26,7 +26,10 @@ selena_graphics.inc:	\
 	water_note_e.lzsa water_note_w.lzsa water_note_s.lzsa \
 	tower_view_n.lzsa tower_view_s.lzsa tower_view_e.lzsa tower_view_w.lzsa \
 	chasm_path_e.lzsa chasm_path_w.lzsa \
-	chasm_e.lzsa chasm_s.lzsa chasm_n.lzsa
+	chasm_e.lzsa chasm_s.lzsa chasm_n.lzsa \
+	clock_path_e.lzsa clock_path_w.lzsa \
+	clock_n.lzsa clock_s.lzsa clock_e.lzsa clock_w.lzsa \
+	clock_note_s.lzsa
 	echo "controls_e_lzsa: .incbin \"controls_e.lzsa\"" > selena_graphics.inc
 	echo "organ_w_lzsa: .incbin \"organ_w.lzsa\"" >> selena_graphics.inc
 	echo "spaceship_inside_w_lzsa: .incbin \"spaceship_inside_w.lzsa\"" >> selena_graphics.inc
@@ -62,7 +65,13 @@ selena_graphics.inc:	\
 	echo "chasm_e_lzsa: .incbin \"chasm_e.lzsa\"" >> selena_graphics.inc
 	echo "chasm_n_lzsa: .incbin \"chasm_n.lzsa\"" >> selena_graphics.inc
 	echo "chasm_s_lzsa: .incbin \"chasm_s.lzsa\"" >> selena_graphics.inc
-
+	echo "clock_path_e_lzsa: .incbin \"clock_path_e.lzsa\"" >> selena_graphics.inc
+	echo "clock_path_w_lzsa: .incbin \"clock_path_w.lzsa\"" >> selena_graphics.inc
+	echo "clock_n_lzsa: .incbin \"clock_n.lzsa\"" >> selena_graphics.inc
+	echo "clock_s_lzsa: .incbin \"clock_s.lzsa\"" >> selena_graphics.inc
+	echo "clock_e_lzsa: .incbin \"clock_e.lzsa\"" >> selena_graphics.inc
+	echo "clock_w_lzsa: .incbin \"clock_w.lzsa\"" >> selena_graphics.inc
+	echo "clock_note_s_lzsa: .incbin \"clock_note_s.lzsa\"" >> selena_graphics.inc
 
 
 %.gr: %.png
diff --git a/mist/graphics_selena/clock_e.png b/mist/graphics_selena/clock_e.png
new file mode 100644
index 00000000..91708ce5
Binary files /dev/null and b/mist/graphics_selena/clock_e.png differ
diff --git a/mist/graphics_selena/clock_n.png b/mist/graphics_selena/clock_n.png
new file mode 100644
index 00000000..ee1f47ac
Binary files /dev/null and b/mist/graphics_selena/clock_n.png differ
diff --git a/mist/graphics_selena/clock_note_s.png b/mist/graphics_selena/clock_note_s.png
new file mode 100644
index 00000000..fc952829
Binary files /dev/null and b/mist/graphics_selena/clock_note_s.png differ
diff --git a/mist/graphics_selena/clock_path_e.png b/mist/graphics_selena/clock_path_e.png
new file mode 100644
index 00000000..60ff679c
Binary files /dev/null and b/mist/graphics_selena/clock_path_e.png differ
diff --git a/mist/graphics_selena/clock_path_w.png b/mist/graphics_selena/clock_path_w.png
new file mode 100644
index 00000000..9bea93ce
Binary files /dev/null and b/mist/graphics_selena/clock_path_w.png differ
diff --git a/mist/graphics_selena/clock_s.png b/mist/graphics_selena/clock_s.png
new file mode 100644
index 00000000..ad525ee4
Binary files /dev/null and b/mist/graphics_selena/clock_s.png differ
diff --git a/mist/graphics_selena/clock_w.png b/mist/graphics_selena/clock_w.png
new file mode 100644
index 00000000..e241c132
Binary files /dev/null and b/mist/graphics_selena/clock_w.png differ
diff --git a/mist/leveldata_selena.inc b/mist/leveldata_selena.inc
index 885185bc..62351acd 100644
--- a/mist/leveldata_selena.inc
+++ b/mist/leveldata_selena.inc
@@ -8,7 +8,7 @@ locations:
 	.word location4, location5, location6, location7
 	.word location8, location9, location10,location11
 	.word location12,location13,location14,location15
-	.word location16
+	.word location16,location17,location18,location19
 
 ; SELENA_INSIDE_SHIP		-- Inside Ship
 location0:
@@ -269,11 +269,11 @@ location13:
 location14:
 	.byte	$ff			; north exit
 	.byte	SELENA_WATER_TURN	; south exit
-	.byte	$ff			; east exit
+	.byte	SELENA_CLOCK_PATH	; east exit
 	.byte	SELENA_CHASM_PATH	; west exit
 	.byte	$ff		; north exit_dir
 	.byte	DIRECTION_S	; south exit_dir
-	.byte	$ff		; east exit_dir
+	.byte	DIRECTION_E	; east exit_dir
 	.byte	DIRECTION_W	; west exit_dir
 	.word	tower_view_n_lzsa		; north bg
 	.word	tower_view_s_lzsa		; south bg
@@ -316,8 +316,54 @@ location16:
 	.byte	BG_SOUTH|BG_EAST|BG_NORTH
 	.byte	$ff
 
+; SELENA_CLOCK_PATH			-- path on way to clock
+location17:
+	.byte	$ff			; north exit
+	.byte	$ff			; south exit
+	.byte	SELENA_CLOCK		; east exit
+	.byte	SELENA_TOWER_VIEW	; west exit
+	.byte	$ff		; north exit_dir
+	.byte	$ff		; south exit_dir
+	.byte	DIRECTION_E	; east exit_dir
+	.byte	DIRECTION_W	; west exit_dir
+	.word	$0000				; north bg
+	.word	$0000				; south bg
+	.word	clock_path_e_lzsa		; east bg
+	.word	clock_path_w_lzsa		; west bg
+	.byte	BG_EAST|BG_WEST
+	.byte	$ff
 
+; SELENA_CLOCK			-- clocks
+location18:
+	.byte	$ff			; north exit
+	.byte	SELENA_CLOCK_CLOSE	; south exit
+	.byte	$ff			; east exit
+	.byte	SELENA_CLOCK_PATH	; west exit
+	.byte	$ff		; north exit_dir
+	.byte	DIRECTION_S	; south exit_dir
+	.byte	$ff		; east exit_dir
+	.byte	DIRECTION_W	; west exit_dir
+	.word	clock_n_lzsa			; north bg
+	.word	clock_s_lzsa			; south bg
+	.word	clock_e_lzsa			; east bg
+	.word	clock_w_lzsa			; west bg
+	.byte	BG_SOUTH|BG_EAST|BG_WEST|BG_NORTH
+	.byte	$ff
 
-
-
+; SELENA_CLOCK_CLOSE		-- clock device
+location19:
+	.byte	$ff			; north exit
+	.byte	SELENA_CLOCK		; south exit
+	.byte	$ff			; east exit
+	.byte	$ff			; west exit
+	.byte	$ff		; north exit_dir
+	.byte	DIRECTION_S	; south exit_dir
+	.byte	$ff		; east exit_dir
+	.byte	$ff		; west exit_dir
+	.word	$0000				; north bg
+	.word	clock_note_s_lzsa		; south bg
+	.word	$0000				; east bg
+	.word	$0000				; west bg
+	.byte	BG_SOUTH
+	.byte	$ff