diff --git a/mist/Makefile b/mist/Makefile
index cbbcf803..a4971beb 100644
--- a/mist/Makefile
+++ b/mist/Makefile
@@ -23,8 +23,8 @@ mist.dsk:	HELLO LOADER MIST_TITLE MIST OCTAGON MECHE SELENA VIEWER STONEY
 
 mist_side2.dsk:	MECHE
 	cp empty.dsk mist_side2.dsk
-	$(DOS33) -y mist.dsk BSAVE -a 0x1400 MECHE
-	$(DOS33) -y mist.dsk BSAVE -a 0x9000 ./audio/link_noise.btc LINK_NOISE.BTC
+	$(DOS33) -y mist_side2.dsk BSAVE -a 0x1400 MECHE
+	$(DOS33) -y mist_side2.dsk BSAVE -a 0x9000 ./audio/link_noise.btc LINK_NOISE.BTC
 
 ###
 
diff --git a/mist/common_defines.inc b/mist/common_defines.inc
index 70d087c7..ff1f9959 100644
--- a/mist/common_defines.inc
+++ b/mist/common_defines.inc
@@ -133,6 +133,11 @@ OCTAGON_ELEVATOR_IN	=	18
 OCTAGON_TOWER_BOOK	=	19
 OCTAGON_BOOK_LADDER	=	20
 OCTAGON_BOOK_VIEW	=	21
+OCTAGON_TOWER_KEY	=	22
+OCTAGON_TOWER_LEFT	=	23
+OCTAGON_TOWER_RIGHT	=	24
+OCTAGON_KEY_LADDER	=	25
+OCTAGON_KEY_VIEW	=	26
 
 ; Mechanical Engineering
 
diff --git a/mist/graphics_octagon/Makefile b/mist/graphics_octagon/Makefile
index b8efa970..a1bc9f9a 100644
--- a/mist/graphics_octagon/Makefile
+++ b/mist/graphics_octagon/Makefile
@@ -35,7 +35,10 @@ octagon_graphics.inc:	\
 	tower_book_s.lzsa tower_book_n.lzsa tower_book_e.lzsa tower_book_w.lzsa \
 	tower_book_ladder_s.lzsa tower_book_ladder_n.lzsa \
 	tower_book_view_n.lzsa \
-	tower_book_view_blank_s.lzsa tower_book_view_ship_s.lzsa
+	tower_book_view_blank_s.lzsa tower_book_view_ship_s.lzsa \
+	tower_key_n.lzsa tower_key_s.lzsa tower_key_e.lzsa tower_key_w.lzsa \
+	tower_left_n.lzsa tower_left_s.lzsa \
+	tower_right_n.lzsa tower_right_s.lzsa
 	echo "temple_door_n_lzsa: .incbin \"temple_door_n.lzsa\"" > octagon_graphics.inc
 	echo "temple_door_s_lzsa: .incbin \"temple_door_s.lzsa\"" >> octagon_graphics.inc
 	echo "temple_door_closed_s_lzsa: .incbin \"temple_door_closed_s.lzsa\"" >> octagon_graphics.inc
@@ -82,6 +85,14 @@ octagon_graphics.inc:	\
 	echo "tower_book_view_n_lzsa: .incbin \"tower_book_view_n.lzsa\"" >> octagon_graphics.inc
 	echo "tower_book_view_blank_s_lzsa: .incbin \"tower_book_view_blank_s.lzsa\"" >> octagon_graphics.inc
 	echo "tower_book_view_ship_s_lzsa: .incbin \"tower_book_view_ship_s.lzsa\"" >> octagon_graphics.inc
+	echo "tower_key_n_lzsa: .incbin \"tower_key_n.lzsa\"" >> octagon_graphics.inc
+	echo "tower_key_s_lzsa: .incbin \"tower_key_s.lzsa\"" >> octagon_graphics.inc
+	echo "tower_key_e_lzsa: .incbin \"tower_key_e.lzsa\"" >> octagon_graphics.inc
+	echo "tower_key_w_lzsa: .incbin \"tower_key_w.lzsa\"" >> octagon_graphics.inc
+	echo "tower_left_n_lzsa: .incbin \"tower_left_n.lzsa\"" >> octagon_graphics.inc
+	echo "tower_left_s_lzsa: .incbin \"tower_left_s.lzsa\"" >> octagon_graphics.inc
+	echo "tower_right_n_lzsa: .incbin \"tower_right_n.lzsa\"" >> octagon_graphics.inc
+	echo "tower_right_s_lzsa: .incbin \"tower_right_s.lzsa\"" >> octagon_graphics.inc
 
 %.gr: %.png
 	$(PNG2GR) $< $@
@@ -92,4 +103,4 @@ octagon_graphics.inc:	\
 ####
 
 clean:		
-		rm -f *~ *.o *.lst *.gr octagon_graphics.inc
+		rm -f *~ *.o *.lst *.gr *.lzsa octagon_graphics.inc
diff --git a/mist/graphics_octagon/tower_key_e.png b/mist/graphics_octagon/tower_key_e.png
new file mode 100644
index 00000000..8dccf125
Binary files /dev/null and b/mist/graphics_octagon/tower_key_e.png differ
diff --git a/mist/graphics_octagon/tower_key_n.png b/mist/graphics_octagon/tower_key_n.png
new file mode 100644
index 00000000..b7357aa2
Binary files /dev/null and b/mist/graphics_octagon/tower_key_n.png differ
diff --git a/mist/graphics_octagon/tower_key_s.png b/mist/graphics_octagon/tower_key_s.png
new file mode 100644
index 00000000..c01d825c
Binary files /dev/null and b/mist/graphics_octagon/tower_key_s.png differ
diff --git a/mist/graphics_octagon/tower_key_w.png b/mist/graphics_octagon/tower_key_w.png
new file mode 100644
index 00000000..85ebc301
Binary files /dev/null and b/mist/graphics_octagon/tower_key_w.png differ
diff --git a/mist/graphics_octagon/tower_left_n.png b/mist/graphics_octagon/tower_left_n.png
new file mode 100644
index 00000000..e26aa7de
Binary files /dev/null and b/mist/graphics_octagon/tower_left_n.png differ
diff --git a/mist/graphics_octagon/tower_left_s.png b/mist/graphics_octagon/tower_left_s.png
new file mode 100644
index 00000000..b4a4242f
Binary files /dev/null and b/mist/graphics_octagon/tower_left_s.png differ
diff --git a/mist/graphics_octagon/tower_right_n.png b/mist/graphics_octagon/tower_right_n.png
new file mode 100644
index 00000000..ca5ce765
Binary files /dev/null and b/mist/graphics_octagon/tower_right_n.png differ
diff --git a/mist/graphics_octagon/tower_right_s.png b/mist/graphics_octagon/tower_right_s.png
new file mode 100644
index 00000000..f1e15550
Binary files /dev/null and b/mist/graphics_octagon/tower_right_s.png differ
diff --git a/mist/leveldata_octagon.inc b/mist/leveldata_octagon.inc
index b33c661b..c14be7a3 100644
--- a/mist/leveldata_octagon.inc
+++ b/mist/leveldata_octagon.inc
@@ -9,7 +9,8 @@ locations:
 	.word location8, location9, location10,location11
 	.word location12,location13,location14,location15
 	.word location16,location17,location18,location19
-	.word location20,location21
+	.word location20,location21,location22,location23
+	.word location24
 
 ; OCTAGON_TEMPLE_DOORWAY	-- temple doorway
 location0:
@@ -360,12 +361,12 @@ location18:
 location19:
 	.byte	OCTAGON_ELEVATOR_IN	; north exit
 	.byte	OCTAGON_BOOK_LADDER	; south exit
-	.byte	$ff			; east exit
-	.byte	$ff			; west exit
+	.byte	OCTAGON_TOWER_RIGHT	; east exit
+	.byte	OCTAGON_TOWER_LEFT	; west exit
 	.byte	DIRECTION_S	; north exit_dir
 	.byte	DIRECTION_S	; south exit_dir
-	.byte	$ff		; east exit_dir
-	.byte	$ff		; west exit_dir
+	.byte	DIRECTION_N	; east exit_dir
+	.byte	DIRECTION_N	; west exit_dir
 	.word	tower_book_n_lzsa	; north bg
 	.word	tower_book_s_lzsa	; south bg
 	.word	tower_book_e_lzsa	; east bg
@@ -406,3 +407,57 @@ location21:
 	.word	$0000				; west bg
 	.byte	BG_SOUTH|BG_NORTH
 	.byte	$ff
+
+; OCTAGON_TOWER_KEY		-- base of key ladder
+location22:
+	.byte	OCTAGON_KEY_LADDER	; north exit
+	.byte	$ff			; south exit
+	.byte	OCTAGON_TOWER_LEFT	; east exit
+	.byte	OCTAGON_TOWER_RIGHT	; west exit
+	.byte	DIRECTION_N	; north exit_dir
+	.byte	$ff		; south exit_dir
+	.byte	DIRECTION_S	; east exit_dir
+	.byte	DIRECTION_S	; west exit_dir
+	.word	tower_key_n_lzsa	; north bg
+	.word	tower_key_s_lzsa	; south bg
+	.word	tower_key_e_lzsa	; east bg
+	.word	tower_key_w_lzsa	; west bg
+	.byte	BG_SOUTH|BG_NORTH|BG_EAST|BG_WEST
+	.byte	$ff
+
+; OCTAGON_TOWER_LEFT		-- left out of elevator
+location23:
+	.byte	OCTAGON_TOWER_KEY	; north exit
+	.byte	OCTAGON_TOWER_BOOK	; south exit
+	.byte	$ff			; east exit
+	.byte	$ff			; west exit
+	.byte	DIRECTION_N	; north exit_dir
+	.byte	DIRECTION_S	; south exit_dir
+	.byte	$ff		; east exit_dir
+	.byte	$ff		; west exit_dir
+	.word	tower_left_n_lzsa	; north bg
+	.word	tower_left_s_lzsa	; south bg
+	.word	$0000			; east bg
+	.word	$0000			; west bg
+	.byte	BG_SOUTH|BG_NORTH
+	.byte	$ff
+
+; OCTAGON_TOWER_RIGHT		-- right out of elevator
+location24:
+	.byte	OCTAGON_TOWER_KEY	; north exit
+	.byte	OCTAGON_TOWER_BOOK	; south exit
+	.byte	$ff			; east exit
+	.byte	$ff			; west exit
+	.byte	DIRECTION_N	; north exit_dir
+	.byte	DIRECTION_S	; south exit_dir
+	.byte	$ff		; east exit_dir
+	.byte	$ff		; west exit_dir
+	.word	tower_right_n_lzsa	; north bg
+	.word	tower_right_s_lzsa	; south bg
+	.word	$0000			; east bg
+	.word	$0000			; west bg
+	.byte	BG_SOUTH|BG_NORTH
+	.byte	$ff
+
+
+
diff --git a/mist/octagon_bookshelf.s b/mist/octagon_bookshelf.s
index 86135189..aa80f1f0 100644
--- a/mist/octagon_bookshelf.s
+++ b/mist/octagon_bookshelf.s
@@ -154,3 +154,12 @@ close_bookshelf:
 
 	rts
 
+
+
+
+
+; TOWER ROTATION HINTS
+; DOCK
+; OCTOBER 11, 1984 10:04 AM
+; JANUARY 17, 1207 5:46 AM
+; NOVEMBER 23, 9791 6:57 PM