diff --git a/mist/common_defines.inc b/mist/common_defines.inc
index 18949186..ddc4fc45 100644
--- a/mist/common_defines.inc
+++ b/mist/common_defines.inc
@@ -450,6 +450,12 @@ ARBOR_STEPS1		=	29
 ARBOR_STEPS_BOTTOM	=	30
 ARBOR_ARRIVAL_NOELEV	=	31
 ARBOR_IN_LONGSHACK3	=	32
+ARBOR_HUT6		=	33
+ARBOR_HUT5		=	34
+ARBOR_HUT4		=	35
+ARBOR_HUT7		=	36
+ARBOR_HUT3		=	37
+
 
 ; NIBEL, up in the clouds
 NIBEL_IN_ELEV2_TOP_CLOSED=	0
diff --git a/mist/graphics_arbor/Makefile b/mist/graphics_arbor/Makefile
index c70d49a5..6d664b3a 100644
--- a/mist/graphics_arbor/Makefile
+++ b/mist/graphics_arbor/Makefile
@@ -38,7 +38,10 @@ arbor_graphics.inc:	\
 	steps1_e.lzsa steps1_w.lzsa \
 	steps2_e.lzsa steps2_w.lzsa \
 	steps_bottom_e.lzsa steps_bottom_open_w.lzsa steps_bottom_closed_w.lzsa \
-	inlongshack3_n.lzsa inlongshack3_s.lzsa inlongshack3_e.lzsa inlongshack3_w.lzsa
+	inlongshack3_n.lzsa inlongshack3_s.lzsa inlongshack3_e.lzsa inlongshack3_w.lzsa \
+	hut6_n.lzsa hut6_w.lzsa \
+	hut5_s.lzsa hut5_w.lzsa \
+	hut4_n.lzsa hut4_s.lzsa hut4_e.lzsa hut4_w.lzsa
 	echo "arrival_e_lzsa: .incbin \"arrival_e.lzsa\"" > arbor_graphics.inc
 	echo "arrival_open_e_lzsa: .incbin \"arrival_open_e.lzsa\"" >> arbor_graphics.inc
 	echo "arrival_w_lzsa: .incbin \"arrival_w.lzsa\"" >> arbor_graphics.inc
@@ -112,6 +115,14 @@ arbor_graphics.inc:	\
 	echo "inlongshack3_s_lzsa: .incbin \"inlongshack3_s.lzsa\"" >> arbor_graphics.inc
 	echo "inlongshack3_e_lzsa: .incbin \"inlongshack3_e.lzsa\"" >> arbor_graphics.inc
 	echo "inlongshack3_w_lzsa: .incbin \"inlongshack3_w.lzsa\"" >> arbor_graphics.inc
+	echo "hut6_n_lzsa: .incbin \"hut6_n.lzsa\"" >> arbor_graphics.inc
+	echo "hut6_w_lzsa: .incbin \"hut6_w.lzsa\"" >> arbor_graphics.inc
+	echo "hut5_s_lzsa: .incbin \"hut5_s.lzsa\"" >> arbor_graphics.inc
+	echo "hut5_w_lzsa: .incbin \"hut5_w.lzsa\"" >> arbor_graphics.inc
+	echo "hut4_n_lzsa: .incbin \"hut4_n.lzsa\"" >> arbor_graphics.inc
+	echo "hut4_s_lzsa: .incbin \"hut4_s.lzsa\"" >> arbor_graphics.inc
+	echo "hut4_e_lzsa: .incbin \"hut4_e.lzsa\"" >> arbor_graphics.inc
+	echo "hut4_w_lzsa: .incbin \"hut4_w.lzsa\"" >> arbor_graphics.inc
 
 %.gr: %.png
 	$(PNG2GR) $< $@
diff --git a/mist/graphics_arbor/hut4_e.png b/mist/graphics_arbor/hut4_e.png
new file mode 100644
index 00000000..4c7962df
Binary files /dev/null and b/mist/graphics_arbor/hut4_e.png differ
diff --git a/mist/graphics_arbor/hut4_n.png b/mist/graphics_arbor/hut4_n.png
new file mode 100644
index 00000000..63ed94fb
Binary files /dev/null and b/mist/graphics_arbor/hut4_n.png differ
diff --git a/mist/graphics_arbor/hut4_s.png b/mist/graphics_arbor/hut4_s.png
new file mode 100644
index 00000000..4bf633ed
Binary files /dev/null and b/mist/graphics_arbor/hut4_s.png differ
diff --git a/mist/graphics_arbor/hut4_w.png b/mist/graphics_arbor/hut4_w.png
new file mode 100644
index 00000000..ab775595
Binary files /dev/null and b/mist/graphics_arbor/hut4_w.png differ
diff --git a/mist/graphics_arbor/hut5_s.png b/mist/graphics_arbor/hut5_s.png
new file mode 100644
index 00000000..b507e05c
Binary files /dev/null and b/mist/graphics_arbor/hut5_s.png differ
diff --git a/mist/graphics_arbor/hut5_w.png b/mist/graphics_arbor/hut5_w.png
new file mode 100644
index 00000000..524c9440
Binary files /dev/null and b/mist/graphics_arbor/hut5_w.png differ
diff --git a/mist/graphics_arbor/hut6_n.png b/mist/graphics_arbor/hut6_n.png
new file mode 100644
index 00000000..f62fbb28
Binary files /dev/null and b/mist/graphics_arbor/hut6_n.png differ
diff --git a/mist/graphics_arbor/hut6_w.png b/mist/graphics_arbor/hut6_w.png
new file mode 100644
index 00000000..0c2caada
Binary files /dev/null and b/mist/graphics_arbor/hut6_w.png differ
diff --git a/mist/leveldata_arbor.inc b/mist/leveldata_arbor.inc
index fe0eea4d..dab09d2d 100644
--- a/mist/leveldata_arbor.inc
+++ b/mist/leveldata_arbor.inc
@@ -11,7 +11,7 @@ locations:
 	.word location20,location21,location22,location23
 	.word location24,location25,location26,location27
 	.word location28,location29,location30,location31
-	.word location32
+	.word location32,location33,location34,location35
 
 ; ARBOR_INSIDE_ELEV1		-- arrival in elevator1
 location0:
@@ -589,11 +589,11 @@ location31:
 location32:
 	.byte	ARBOR_LONGSHACK3	; north exit
 	.byte	ARBOR_BRIDGE6		; south exit
-	.byte	$ff			; east exit
+	.byte	ARBOR_HUT6		; east exit
 	.byte	$ff			; west exit
 	.byte	DIRECTION_N	; north exit_dir
 	.byte	DIRECTION_S	; south exit_dir
-	.byte	$ff		; east exit_dir
+	.byte	DIRECTION_N	; east exit_dir
 	.byte	$ff		; west exit_dir
 	.word	inlongshack3_n_lzsa	; north bg
 	.word	inlongshack3_s_lzsa	; south bg
@@ -601,3 +601,57 @@ location32:
 	.word	inlongshack3_w_lzsa	; west bg
 	.byte	BG_NORTH|BG_SOUTH|BG_EAST|BG_WEST
 	.byte	$ff
+
+; ARBOR_HUT6		-- inside hut6
+location33:
+	.byte	ARBOR_HUT5		; north exit
+	.byte	$ff			; south exit
+	.byte	$ff			; east exit
+	.byte	ARBOR_IN_LONGSHACK3	; west exit
+	.byte	DIRECTION_W	; north exit_dir
+	.byte	$ff		; south exit_dir
+	.byte	$ff		; east exit_dir
+	.byte	DIRECTION_W	; west exit_dir
+	.word	hut6_n_lzsa		; north bg
+	.word	$ff			; south bg
+	.word	$ff			; east bg
+	.word	hut6_w_lzsa		; west bg
+	.byte	BG_NORTH|BG_WEST
+	.byte	$ff
+
+; ARBOR_HUT5		-- inside hut5
+location34:
+	.byte	$ff			; north exit
+	.byte	ARBOR_HUT6		; south exit
+	.byte	$ff			; east exit
+	.byte	ARBOR_HUT4		; west exit
+	.byte	$ff		; north exit_dir
+	.byte	DIRECTION_W	; south exit_dir
+	.byte	$ff		; east exit_dir
+	.byte	DIRECTION_W	; west exit_dir
+	.word	$ff			; north bg
+	.word	hut5_s_lzsa		; south bg
+	.word	$ff			; east bg
+	.word	hut5_w_lzsa		; west bg
+	.byte	BG_SOUTH|BG_WEST
+	.byte	$ff
+
+; ARBOR_HUT4		-- inside hut4
+location35:
+	.byte	$ff			; north exit
+	.byte	ARBOR_HUT2_INSIDE	; south exit
+	.byte	ARBOR_HUT5		; east exit
+	.byte	$ff		; west exit
+	.byte	$ff		; north exit_dir
+	.byte	DIRECTION_S	; south exit_dir
+	.byte	DIRECTION_S	; east exit_dir
+	.byte	$ff		; west exit_dir
+	.word	hut4_n_lzsa		; north bg
+	.word	hut4_s_lzsa		; south bg
+	.word	hut4_e_lzsa		; east bg
+	.word	hut4_w_lzsa		; west bg
+	.byte	BG_NORTH|BG_SOUTH|BG_EAST|BG_WEST
+	.byte	$ff
+
+
+