diff --git a/mist/TODO b/mist/TODO
index f9cdbc64..9f0cca74 100644
--- a/mist/TODO
+++ b/mist/TODO
@@ -25,11 +25,12 @@ Move sound to language card (meaning no sound on II+ w/o language card)
 Marker Switches (8):
 + * Dock
 + * Gears
-+ Dentist
++ * Dentist
 + * Pool
-+ Spaceship
++ * Spaceship
 + Clock
 + Cabin
++ Generator
 
 Fireplace:
 + 8x6 grid
@@ -42,9 +43,9 @@ Fireplace:
 + close-in clock
 + clock with gears up
 + clock switch
-+ dentist switch
-+ looking back from dentist switch
-+ spaceship switch
++ * dentist switch
++ * looking back from dentist switch
++ * spaceship switch
 + open gear
 + gear linking book
 + fireplace close
diff --git a/mist/graphics_island/Makefile b/mist/graphics_island/Makefile
index b894ea2a..82b6f28e 100644
--- a/mist/graphics_island/Makefile
+++ b/mist/graphics_island/Makefile
@@ -33,7 +33,8 @@ mist_graphics.inc:	\
 	tree5_n.lzsa tree5_e.lzsa \
 	gear_n.lzsa gear_w.lzsa gear_s.lzsa \
 	gear_base_n.lzsa \
-	dentist_door_n.lzsa dentist_door_s.lzsa
+	dentist_door_n.lzsa dentist_door_s.lzsa \
+	spaceship_switch_n.lzsa
 	echo "m_link_book_lzsa: .incbin \"m_link_book.lzsa\"" > mist_graphics.inc
 	echo "dock_n_lzsa: .incbin \"dock_n.lzsa\"" >> mist_graphics.inc
 	echo "dock_s_lzsa: .incbin \"dock_s.lzsa\"" >> mist_graphics.inc
@@ -84,7 +85,7 @@ mist_graphics.inc:	\
 	echo "gear_base_n_lzsa: .incbin \"gear_base_n.lzsa\"" >> mist_graphics.inc
 	echo "dentist_door_n_lzsa: .incbin \"dentist_door_n.lzsa\"" >> mist_graphics.inc
 	echo "dentist_door_s_lzsa: .incbin \"dentist_door_s.lzsa\"" >> mist_graphics.inc
-
+	echo "spaceship_switch_n_lzsa: .incbin \"spaceship_switch_n.lzsa\"" >> mist_graphics.inc
 
 
 %.gr: %.png
diff --git a/mist/graphics_island/mist_graphics.inc b/mist/graphics_island/mist_graphics.inc
index e513eae3..868122f1 100644
--- a/mist/graphics_island/mist_graphics.inc
+++ b/mist/graphics_island/mist_graphics.inc
@@ -48,3 +48,4 @@ gear_w_lzsa: .incbin "gear_w.lzsa"
 gear_base_n_lzsa: .incbin "gear_base_n.lzsa"
 dentist_door_n_lzsa: .incbin "dentist_door_n.lzsa"
 dentist_door_s_lzsa: .incbin "dentist_door_s.lzsa"
+spaceship_switch_n_lzsa: .incbin "spaceship_switch_n.lzsa"
diff --git a/mist/graphics_island/spaceship_switch_n.png b/mist/graphics_island/spaceship_switch_n.png
new file mode 100644
index 00000000..3331fd81
Binary files /dev/null and b/mist/graphics_island/spaceship_switch_n.png differ
diff --git a/mist/mist.s b/mist/mist.s
index bbeeb65c..94033914 100644
--- a/mist/mist.s
+++ b/mist/mist.s
@@ -816,7 +816,7 @@ locations:
 	.word location8, location9, location10,location11
 	.word location12,location13,location14,location15
 	.word location16,location17,location18,location19
-	.word location20,location21
+	.word location20,location21,location22
 
 ; myst linking book
 location0:
@@ -1143,11 +1143,11 @@ location15:
 
 ; spaceship far
 location16:
-	.byte	16		; north exit
+	.byte	22		; north exit
 	.byte	$ff		; south exit
 	.byte	10		; east exit
 	.byte	$ff		; west exit
-	.byte	DIRECTION_E	; north exit_dir
+	.byte	DIRECTION_N	; north exit_dir
 	.byte	$ff		; south exit_dir
 	.byte	DIRECTION_E	; east exit_dir
 	.byte	$ff		; west exit_dir
@@ -1263,6 +1263,26 @@ location21:
 	.word	$0000		; special function
 	.byte	BG_NORTH | BG_SOUTH
 
+; spaceship switch
+location22:
+	.byte	16		; north exit
+	.byte	$ff		; south exit
+	.byte	$ff		; east exit
+	.byte	$ff		; west exit
+	.byte	DIRECTION_E	; north exit_dir
+	.byte	$ff		; south exit_dir
+	.byte	$ff		; east exit_dir
+	.byte	$ff		; west exit_dir
+	.byte	$ff		; special exit
+	.word	spaceship_switch_n_lzsa	; north bg
+	.word	$0000		; south bg
+	.word	$0000		; east bg
+	.word	$0000		; west bg
+	.byte	$ff,$ff		; special x
+	.byte	$ff,$ff		; special y
+	.word	$0000		; special function
+	.byte	BG_NORTH
+