diff --git a/mist/common_defines.inc b/mist/common_defines.inc
index f9534bcc..939edc87 100644
--- a/mist/common_defines.inc
+++ b/mist/common_defines.inc
@@ -341,4 +341,9 @@ CHANNEL_WIND_PATH2	=	28
 CHANNEL_ISLAND1		=	29
 CHANNEL_ISLAND2		=	30
 CHANNEL_ISLAND3		=	31
+CHANNEL_SHACK		=	32
+CHANNEL_TANK		=	33
+CHANNEL_TANK_CLOSE	=	34
+CHANNEL_WINDMILL	=	35
+CHANNEL_OUT_BACK	=	36
 
diff --git a/mist/graphics_channel/Makefile b/mist/graphics_channel/Makefile
index 757595da..fd3d214f 100644
--- a/mist/graphics_channel/Makefile
+++ b/mist/graphics_channel/Makefile
@@ -40,7 +40,11 @@ channel_graphics.inc:	\
 	wind_path2_n.lzsa wind_path2_s.lzsa \
 	island1_n.lzsa island1_s.lzsa \
 	island2_n.lzsa island2_s.lzsa \
-	island3_n.lzsa island3_s.lzsa
+	island3_n.lzsa island3_s.lzsa \
+	shack_n.lzsa shack_s.lzsa \
+	tank_n.lzsa tank_s.lzsa tank_close.lzsa \
+	windmill_n.lzsa windmill_s.lzsa \
+	outback_n.lzsa outback_s.lzsa
 	echo "arrival_n_lzsa: .incbin \"arrival_n.lzsa\"" > channel_graphics.inc
 	echo "arrival_s_lzsa: .incbin \"arrival_s.lzsa\"" >> channel_graphics.inc
 	echo "clearing_e_lzsa: .incbin \"clearing_e.lzsa\"" >> channel_graphics.inc
@@ -106,6 +110,15 @@ channel_graphics.inc:	\
 	echo "island2_s_lzsa: .incbin \"island2_s.lzsa\"" >> channel_graphics.inc
 	echo "island3_n_lzsa: .incbin \"island3_n.lzsa\"" >> channel_graphics.inc
 	echo "island3_s_lzsa: .incbin \"island3_s.lzsa\"" >> channel_graphics.inc
+	echo "shack_n_lzsa: .incbin \"shack_n.lzsa\"" >> channel_graphics.inc
+	echo "shack_s_lzsa: .incbin \"shack_s.lzsa\"" >> channel_graphics.inc
+	echo "tank_n_lzsa: .incbin \"tank_n.lzsa\"" >> channel_graphics.inc
+	echo "tank_s_lzsa: .incbin \"tank_s.lzsa\"" >> channel_graphics.inc
+	echo "tank_close_lzsa: .incbin \"tank_close.lzsa\"" >> channel_graphics.inc
+	echo "windmill_n_lzsa: .incbin \"windmill_n.lzsa\"" >> channel_graphics.inc
+	echo "windmill_s_lzsa: .incbin \"windmill_s.lzsa\"" >> channel_graphics.inc
+	echo "outback_n_lzsa: .incbin \"outback_n.lzsa\"" >> channel_graphics.inc
+	echo "outback_s_lzsa: .incbin \"outback_s.lzsa\"" >> channel_graphics.inc
 
 
 %.gr: %.png
diff --git a/mist/graphics_channel/outback_n.png b/mist/graphics_channel/outback_n.png
new file mode 100644
index 00000000..0db2e0f8
Binary files /dev/null and b/mist/graphics_channel/outback_n.png differ
diff --git a/mist/graphics_channel/outback_s.png b/mist/graphics_channel/outback_s.png
new file mode 100644
index 00000000..274a0309
Binary files /dev/null and b/mist/graphics_channel/outback_s.png differ
diff --git a/mist/graphics_channel/shack_n.png b/mist/graphics_channel/shack_n.png
new file mode 100644
index 00000000..3764b360
Binary files /dev/null and b/mist/graphics_channel/shack_n.png differ
diff --git a/mist/graphics_channel/shack_s.png b/mist/graphics_channel/shack_s.png
new file mode 100644
index 00000000..b9b56691
Binary files /dev/null and b/mist/graphics_channel/shack_s.png differ
diff --git a/mist/graphics_channel/tank_close.png b/mist/graphics_channel/tank_close.png
new file mode 100644
index 00000000..f9c0d806
Binary files /dev/null and b/mist/graphics_channel/tank_close.png differ
diff --git a/mist/graphics_channel/tank_n.png b/mist/graphics_channel/tank_n.png
new file mode 100644
index 00000000..777e0dbd
Binary files /dev/null and b/mist/graphics_channel/tank_n.png differ
diff --git a/mist/graphics_channel/tank_s.png b/mist/graphics_channel/tank_s.png
new file mode 100644
index 00000000..24273930
Binary files /dev/null and b/mist/graphics_channel/tank_s.png differ
diff --git a/mist/graphics_channel/windmill_n.png b/mist/graphics_channel/windmill_n.png
new file mode 100644
index 00000000..5eac48db
Binary files /dev/null and b/mist/graphics_channel/windmill_n.png differ
diff --git a/mist/graphics_channel/windmill_s.png b/mist/graphics_channel/windmill_s.png
new file mode 100644
index 00000000..83dba57f
Binary files /dev/null and b/mist/graphics_channel/windmill_s.png differ
diff --git a/mist/leveldata_channel.inc b/mist/leveldata_channel.inc
index f7e369b9..a6508953 100644
--- a/mist/leveldata_channel.inc
+++ b/mist/leveldata_channel.inc
@@ -11,6 +11,8 @@ locations:
 	.word location20,location21,location22,location23
 	.word location24,location25,location26,location27
 	.word location28,location29,location30,location31
+	.word location32,location33,location34,location35
+	.word location36
 
 
 ; CHANNEL_OUTSIDE_CABIN		-- outside in clearing
@@ -557,7 +559,7 @@ location30:
 
 ; CHANNEL_ISLAND3		-- island part3
 location31:
-	.byte	$ff			; north exit
+	.byte	CHANNEL_SHACK		; north exit
 	.byte	CHANNEL_ISLAND2		; south exit
 	.byte	$ff			; east exit
 	.byte	$ff			; west exit
@@ -572,5 +574,87 @@ location31:
 	.byte	BG_NORTH|BG_SOUTH
 	.byte	$ff
 
+; CHANNEL_SHACK			-- island shack
+location32:
+	.byte	CHANNEL_TANK		; north exit
+	.byte	CHANNEL_ISLAND3		; 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	shack_n_lzsa		; north bg
+	.word	shack_s_lzsa		; south bg
+	.word	$0000			; east bg
+	.word	$0000			; west bg
+	.byte	BG_NORTH|BG_SOUTH
+	.byte	$ff
 
+; CHANNEL_TANK			-- inside shack
+location33:
+	.byte	CHANNEL_WINDMILL	; north exit
+	.byte	CHANNEL_SHACK		; 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	tank_n_lzsa		; north bg
+	.word	tank_s_lzsa		; south bg
+	.word	$0000			; east bg
+	.word	$0000			; west bg
+	.byte	BG_NORTH|BG_SOUTH
+	.byte	$ff
 
+; CHANNEL_TANK_CLOSE		-- the faucet
+location34:
+	.byte	CHANNEL_TANK		; north exit
+	.byte	$ff			; south exit
+	.byte	$ff			; east exit
+	.byte	$ff			; west exit
+	.byte	DIRECTION_N	; north exit_dir
+	.byte	$ff		; south exit_dir
+	.byte	$ff		; east exit_dir
+	.byte	$ff		; west exit_dir
+	.word	tank_close_lzsa		; north bg
+	.word	$0000			; south bg
+	.word	$0000			; east bg
+	.word	$0000			; west bg
+	.byte	BG_NORTH
+	.byte	$ff
+
+; CHANNEL_WINDMILL		-- windmill machinery
+location35:
+	.byte	CHANNEL_OUT_BACK	; north exit
+	.byte	CHANNEL_TANK		; 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	windmill_n_lzsa		; north bg
+	.word	windmill_s_lzsa		; south bg
+	.word	$0000			; east bg
+	.word	$0000			; west bg
+	.byte	BG_NORTH|BG_SOUTH
+	.byte	$ff
+
+; CHANNEL_OUT_BACK		-- back door of windmill
+location36:
+	.byte	$ff			; north exit
+	.byte	CHANNEL_WINDMILL	; 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	outback_n_lzsa		; north bg
+	.word	outback_s_lzsa		; south bg
+	.word	$0000			; east bg
+	.word	$0000			; west bg
+	.byte	BG_NORTH|BG_SOUTH
+	.byte	$ff