diff --git a/navar_city/houses/herbertsundertakers b/navar_city/houses/herbertsundertakers
index 7e8655f1d..f8c5554a4 100644
--- a/navar_city/houses/herbertsundertakers
+++ b/navar_city/houses/herbertsundertakers
@@ -2,126 +2,166 @@ arch map
 name Herbert's Undertakers
 difficulty 2
 region navar
-width 14
-height 11
-enter_x 11
-enter_y 2
+width 19
+height 19
+enter_x 14
+enter_y 15
 msg
 Created:  2012-05-19 Rick Tanner
-Modified: 2012-05-19 Rick Tanner
+Modified: 2012-07-25 leaf
 endmsg
 end
-arch blocked
+arch cobblestones2
 end
-arch blocked
+arch cobblestones2
 y 1
 end
-arch blocked
+arch cobblestones2
 y 2
 end
-arch blocked
+arch cobblestones2
 y 3
 end
-arch blocked
+arch cobblestones2
 y 4
 end
-arch blocked
+arch cobblestones2
 y 5
 end
-arch blocked
+arch cobblestones2
 y 6
 end
-arch blocked
+arch cobblestones2
 y 7
 end
-arch blocked
+arch cobblestones2
 y 8
 end
-arch blocked
+arch cobblestones2
 y 9
 end
-arch blocked
+arch cobblestones2
 y 10
 end
-arch blocked
+arch cobblestones2
+y 11
+end
+arch cobblestones2
+y 12
+end
+arch cobblestones2
+y 13
+end
+arch cobblestones2
+y 14
+end
+arch cobblestones2
+y 15
+end
+arch cobblestones2
+y 16
+end
+arch cobblestones2
+y 17
+end
+arch cobblestones2
+y 18
+end
+arch grass_only
 x 1
 end
-arch blocked
+arch grass_only
 x 1
 y 1
 end
-arch blocked
+arch grass_only
 x 1
 y 2
 end
-arch blocked
+arch grass_only
 x 1
 y 3
 end
-arch woodfloor2
+arch grass_only
 x 1
 y 4
 end
-arch wall_2_2_2
-x 1
-y 4
-end
-arch woodfloor2
+arch grass_only
 x 1
 y 5
 end
-arch wall_2_1_1
-x 1
-y 5
-end
-arch woodfloor2
+arch grass_only
 x 1
 y 6
 end
-arch wall_2_1_1
-x 1
-y 6
-end
-arch woodfloor2
+arch grass_only
 x 1
 y 7
 end
-arch wall_2_1_1
-x 1
-y 7
-end
-arch woodfloor2
+arch grass_only
 x 1
 y 8
 end
-arch wall_2_1_1
-x 1
-y 8
-end
-arch woodfloor2
+arch grass_only
 x 1
 y 9
 end
-arch wall_2_2_1
-x 1
-y 9
-end
-arch blocked
+arch grass_only
 x 1
 y 10
 end
-arch blocked
+arch grass_only
+x 1
+y 11
+end
+arch grass_only
+x 1
+y 12
+end
+arch grass_only
+x 1
+y 13
+end
+arch grass_only
+x 1
+y 14
+end
+arch grass_only
+x 1
+y 15
+end
+arch grass_only
+x 1
+y 16
+end
+arch grass_only
+x 1
+y 17
+end
+arch grass_only
+x 1
+y 18
+end
+arch grass_only
 x 2
 end
-arch blocked
+arch grass_only
 x 2
 y 1
 end
-arch blocked
+arch woodfloor2
 x 2
 y 2
 end
-arch blocked
+arch wwall_2_2_2
+x 2
+y 2
+end
+arch woodfloor2
+x 2
+y 3
+end
+arch wwall_2_1_1
 x 2
 y 3
 end
@@ -129,7 +169,7 @@ arch woodfloor2
 x 2
 y 4
 end
-arch wall_2_1_2
+arch wwall_2_1_1
 x 2
 y 4
 end
@@ -137,696 +177,1774 @@ arch woodfloor2
 x 2
 y 5
 end
+arch wwall_2_1_1
+x 2
+y 5
+end
+arch woodfloor2
+x 2
+y 6
+end
+arch wwall_2_1_1
+x 2
+y 6
+end
+arch woodfloor2
+x 2
+y 7
+end
+arch wwall_2_1_1
+x 2
+y 7
+end
+arch woodfloor2
+x 2
+y 8
+end
+arch wwall_3_2
+x 2
+y 8
+end
+arch woodfloor2
+x 2
+y 9
+end
+arch wwall_win1
+x 2
+y 9
+end
+arch woodfloor2
+x 2
+y 10
+end
+arch wwall_2_1_1
+x 2
+y 10
+end
+arch woodfloor2
+x 2
+y 11
+end
+arch wwall_2_1_1
+x 2
+y 11
+end
+arch woodfloor2
+x 2
+y 12
+end
+arch wwall_2_1_1
+x 2
+y 12
+end
+arch woodfloor2
+x 2
+y 13
+end
+arch wwall_2_1_1
+x 2
+y 13
+end
+arch woodfloor2
+x 2
+y 14
+end
+arch wwall_2_1_1
+x 2
+y 14
+end
+arch woodfloor2
+x 2
+y 15
+end
+arch wwall_2_1_1
+x 2
+y 15
+end
+arch woodfloor2
+x 2
+y 16
+end
+arch wwall_2_2_1
+x 2
+y 16
+end
+arch grass_only
+x 2
+y 17
+end
+arch grass_only
+x 2
+y 18
+end
+arch grass_only
+x 3
+end
+arch grass_only
+x 3
+y 1
+end
+arch woodfloor2
+x 3
+y 2
+end
+arch wwall_2_1_2
+x 3
+y 2
+end
+arch woodfloor2
+x 3
+y 3
+end
+arch table_1x2
+x 3
+y 3
+end
+arch woodfloor2
+x 3
+y 4
+end
+arch woodfloor2
+x 3
+y 5
+end
+arch woodfloor2
+x 3
+y 6
+end
+arch woodfloor2
+x 3
+y 7
+end
+arch woodfloor2
+x 3
+y 8
+end
+arch wwall_1_3
+x 3
+y 8
+end
+arch woodfloor2
+x 3
+y 9
+end
+arch woodfloor2
+x 3
+y 10
+end
+arch gravestone
+x 3
+y 10
+end
+arch woodfloor2
+x 3
+y 11
+end
+arch gravestone
+x 3
+y 11
+end
+arch woodfloor2
+x 3
+y 12
+end
+arch gravestone
+x 3
+y 12
+end
+arch woodfloor2
+x 3
+y 13
+end
+arch gravestone
+x 3
+y 13
+end
+arch woodfloor2
+x 3
+y 14
+end
+arch gravestone
+x 3
+y 14
+end
+arch woodfloor2
+x 3
+y 15
+end
+arch gravestone
+x 3
+y 15
+end
+arch woodfloor2
+x 3
+y 16
+end
+arch wwall_2_1_2
+x 3
+y 16
+end
+arch grass_only
+x 3
+y 17
+end
+arch grass_only
+x 3
+y 18
+end
+arch grass_only
+x 4
+end
+arch grass_only
+x 4
+y 1
+end
+arch woodfloor2
+x 4
+y 2
+end
+arch wwall_2_1_2
+x 4
+y 2
+end
+arch woodfloor2
+x 4
+y 3
+end
+arch woodfloor2
+x 4
+y 4
+end
+arch woodfloor2
+x 4
+y 5
+end
+arch woodfloor2
+x 4
+y 6
+end
+arch woodfloor2
+x 4
+y 7
+end
+arch woodfloor2
+x 4
+y 8
+end
+arch door_2
+x 4
+y 8
+end
+arch woodfloor2
+x 4
+y 9
+end
+arch woodfloor2
+x 4
+y 10
+end
+arch woodfloor2
+x 4
+y 11
+end
+arch woodfloor2
+x 4
+y 12
+end
+arch woodfloor2
+x 4
+y 13
+end
+arch woodfloor2
+x 4
+y 14
+end
+arch woodfloor2
+x 4
+y 15
+end
+arch woodfloor2
+x 4
+y 16
+end
+arch wwall_2_1_2
+x 4
+y 16
+end
+arch grass_only
+x 4
+y 17
+end
+arch grass_only
+x 4
+y 18
+end
+arch grass_only
+x 5
+end
+arch grass_only
+x 5
+y 1
+end
+arch woodfloor2
+x 5
+y 2
+end
+arch wwall_2_1_2
+x 5
+y 2
+end
+arch woodfloor2
+x 5
+y 3
+end
+arch woodfloor2
+x 5
+y 4
+end
+arch wwall_0
+x 5
+y 4
+end
+arch woodfloor2
+x 5
+y 5
+end
+arch woodfloor2
+x 5
+y 6
+end
+arch wwall_0
+x 5
+y 6
+end
+arch woodfloor2
+x 5
+y 7
+end
+arch woodfloor2
+x 5
+y 8
+end
+arch wwall_1_4
+x 5
+y 8
+end
+arch woodfloor2
+x 5
+y 9
+end
+arch woodfloor2
+x 5
+y 10
+end
+arch woodfloor2
+x 5
+y 11
+end
+arch woodfloor2
+x 5
+y 12
+end
+arch woodfloor2
+x 5
+y 13
+end
+arch woodfloor2
+x 5
+y 14
+end
+arch woodfloor2
+x 5
+y 15
+end
+arch woodfloor2
+x 5
+y 16
+end
+arch wwall_win2
+x 5
+y 16
+end
+arch grass_only
+x 5
+y 17
+end
+arch grass_only
+x 5
+y 18
+end
+arch grass_only
+x 6
+end
+arch grass_only
+x 6
+y 1
+end
+arch woodfloor2
+x 6
+y 2
+end
+arch wwall_win2
+x 6
+y 2
+end
+arch woodfloor2
+x 6
+y 3
+end
+arch woodfloor2
+x 6
+y 4
+end
+arch woodfloor2
+x 6
+y 5
+end
+arch chair_1.3
+x 6
+y 5
+end
+arch woodfloor2
+x 6
+y 6
+end
+arch chair_1.3
+x 6
+y 6
+end
+arch woodfloor2
+x 6
+y 7
+end
+arch woodfloor2
+x 6
+y 8
+end
+arch wwall_2_2_3
+x 6
+y 8
+end
+arch woodfloor2
+x 6
+y 9
+end
+arch wwall_2_1_1
+x 6
+y 9
+end
+arch woodfloor2
+x 6
+y 10
+end
+arch wwall_2_1_1
+x 6
+y 10
+end
+arch woodfloor2
+x 6
+y 11
+end
+arch wwall_2_2_1
+x 6
+y 11
+end
+arch woodfloor2
+x 6
+y 12
+end
+arch woodfloor2
+x 6
+y 13
+end
 arch gravestone2
-x 2
+x 6
+y 13
+end
+arch woodfloor2
+x 6
+y 14
+end
+arch gravestone2
+x 6
+y 14
+end
+arch woodfloor2
+x 6
+y 15
+end
+arch gravestone2
+x 6
+y 15
+end
+arch woodfloor2
+x 6
+y 16
+end
+arch wwall_2_1_2
+x 6
+y 16
+end
+arch grass_only
+x 6
+y 17
+end
+arch grass_only
+x 6
+y 18
+end
+arch grass_only
+x 7
+end
+arch grass_only
+x 7
+y 1
+end
+arch woodfloor2
+x 7
+y 2
+end
+arch wwall_2_1_2
+x 7
+y 2
+end
+arch woodfloor2
+x 7
+y 3
+end
+arch woodfloor2
+x 7
+y 4
+end
+arch woodfloor2
+x 7
+y 5
+end
+arch chair_1.3
+x 7
 y 5
 end
 arch woodfloor2
-x 2
+x 7
 y 6
 end
+arch chair_1.3
+x 7
+y 6
+end
+arch woodfloor2
+x 7
+y 7
+end
+arch woodfloor2
+x 7
+y 8
+end
+arch wwall_0
+x 7
+y 8
+end
+arch woodfloor2
+x 7
+y 9
+end
+arch woodfloor2
+x 7
+y 10
+end
+arch woodfloor2
+x 7
+y 11
+end
+arch wwall_2_1_2
+x 7
+y 11
+end
+arch woodfloor2
+x 7
+y 12
+end
+arch door_1
+x 7
+y 12
+end
+arch woodfloor2
+x 7
+y 13
+end
+arch wwall_1_1
+x 7
+y 13
+end
+arch woodfloor2
+x 7
+y 14
+end
+arch wwall_2_1_1
+x 7
+y 14
+end
+arch woodfloor2
+x 7
+y 15
+end
+arch wwall_2_1_1
+x 7
+y 15
+end
+arch woodfloor2
+x 7
+y 16
+end
+arch wwall_3_1
+x 7
+y 16
+end
+arch grass_only
+x 7
+y 17
+end
+arch grass_only
+x 7
+y 18
+end
+arch grass_only
+x 8
+end
+arch grass_only
+x 8
+y 1
+end
+arch woodfloor2
+x 8
+y 2
+end
+arch wwall_2_1_2
+x 8
+y 2
+end
+arch woodfloor2
+x 8
+y 3
+end
+arch slevel_3_2
+x 8
+y 3
+end
+arch woodfloor2
+x 8
+y 4
+end
+arch slevel_2_2_1
+x 8
+y 4
+end
+arch woodfloor2
+x 8
+y 5
+end
+arch chair_1.3
+x 8
+y 5
+end
+arch woodfloor2
+x 8
+y 6
+end
+arch chair_1.3
+x 8
+y 6
+end
+arch woodfloor2
+x 8
+y 7
+end
+arch woodfloor2
+x 8
+y 8
+end
+arch woodfloor2
+x 8
+y 9
+end
+arch woodfloor2
+x 8
+y 10
+end
+arch woodfloor2
+x 8
+y 11
+end
+arch wwall_2_1_2
+x 8
+y 11
+end
+arch woodfloor2
+x 8
+y 12
+end
+arch woodfloor2
+x 8
+y 13
+end
+arch woodfloor2
+x 8
+y 14
+end
+arch woodfloor2
+x 8
+y 15
+end
+arch barrel
+x 8
+y 15
+end
+arch woodfloor2
+x 8
+y 16
+end
+arch wwall_2_1_2
+x 8
+y 16
+end
+arch grass_only
+x 8
+y 17
+end
+arch grass_only
+x 8
+y 18
+end
+arch grass_only
+x 9
+end
+arch grass_only
+x 9
+y 1
+end
+arch woodfloor2
+x 9
+y 2
+end
+arch wwall_2_1_2
+x 9
+y 2
+end
+arch woodfloor2
+x 9
+y 3
+end
+arch coffin
+x 9
+y 3
+end
+arch woodfloor2
+x 9
+y 4
+end
+arch slevel_3_1
+x 9
+y 4
+end
+arch woodfloor2
+x 9
+y 5
+end
+arch woodfloor2
+x 9
+y 6
+end
+arch woodfloor2
+x 9
+y 7
+end
+arch woodfloor2
+x 9
+y 8
+end
+arch woodfloor2
+x 9
+y 9
+end
+arch woodfloor2
+x 9
+y 10
+end
+arch woodfloor2
+x 9
+y 11
+end
+arch wwall_2_1_2
+x 9
+y 11
+end
+arch woodfloor2
+x 9
+y 12
+end
+arch woodfloor2
+x 9
+y 13
+end
+arch woodfloor2
+x 9
+y 14
+end
+arch woodfloor2
+x 9
+y 15
+end
+arch table_burl_3
+x 9
+y 15
+end
 arch corpse1
-x 2
-y 6
+x 9
+y 15
 end
 arch woodfloor2
-x 2
-y 7
+x 9
+y 16
 end
-arch woodfloor2
-x 2
-y 8
+arch wwall_2_1_2
+x 9
+y 16
 end
-arch gravestone
-x 2
-y 8
+arch grass_only
+x 9
+y 17
 end
-arch woodfloor2
-x 2
-y 9
+arch grass_only
+x 9
+y 18
 end
-arch wall_2_1_2
-x 2
-y 9
+arch grass_only
+x 10
 end
-arch blocked
-x 2
-y 10
-end
-arch blocked
-x 3
-end
-arch blocked
-x 3
+arch grass_only
+x 10
 y 1
 end
-arch blocked
-x 3
+arch woodfloor2
+x 10
 y 2
 end
-arch blocked
-x 3
+arch wwall_2_1_2
+x 10
+y 2
+end
+arch woodfloor2
+x 10
+y 3
+end
+arch slevel_3_4
+x 10
 y 3
 end
 arch woodfloor2
-x 3
+x 10
 y 4
 end
-arch wall_2_1_2
-x 3
+arch slevel_2_2_4
+x 10
 y 4
 end
 arch woodfloor2
-x 3
+x 10
 y 5
 end
-arch gravestone2
-x 3
+arch chair_1.3
+x 10
 y 5
 end
 arch woodfloor2
-x 3
+x 10
+y 6
+end
+arch chair_1.3
+x 10
 y 6
 end
 arch woodfloor2
-x 3
+x 10
 y 7
 end
 arch woodfloor2
-x 3
-y 8
-end
-arch gravestone
-x 3
+x 10
 y 8
 end
 arch woodfloor2
-x 3
+x 10
 y 9
 end
-arch wall_2_1_2
-x 3
-y 9
-end
-arch blocked
-x 3
+arch woodfloor2
+x 10
 y 10
 end
-arch blocked
-x 4
+arch woodfloor2
+x 10
+y 11
 end
-arch blocked
-x 4
+arch wwall_2_1_2
+x 10
+y 11
+end
+arch woodfloor2
+x 10
+y 12
+end
+arch woodfloor2
+x 10
+y 13
+end
+arch woodfloor2
+x 10
+y 14
+end
+arch woodfloor2
+x 10
+y 15
+end
+arch woodfloor2
+x 10
+y 16
+end
+arch wwall_2_1_2
+x 10
+y 16
+end
+arch grass_only
+x 10
+y 17
+end
+arch grass_only
+x 10
+y 18
+end
+arch grass_only
+x 11
+end
+arch grass_only
+x 11
 y 1
 end
-arch blocked
-x 4
+arch woodfloor2
+x 11
 y 2
 end
-arch blocked
-x 4
+arch wwall_2_1_2
+x 11
+y 2
+end
+arch woodfloor2
+x 11
 y 3
 end
 arch woodfloor2
-x 4
-y 4
-end
-arch wall_2_1_2
-x 4
+x 11
 y 4
 end
 arch woodfloor2
-x 4
+x 11
 y 5
 end
-arch gravestone2
-x 4
+arch chair_1.3
+x 11
 y 5
 end
 arch woodfloor2
-x 4
+x 11
+y 6
+end
+arch chair_1.3
+x 11
 y 6
 end
 arch woodfloor2
-x 4
+x 11
 y 7
 end
-arch chair
-x 4
+arch woodfloor2
+x 11
+y 8
+end
+arch wwall_0
+x 11
+y 8
+end
+arch woodfloor2
+x 11
+y 9
+end
+arch woodfloor2
+x 11
+y 10
+end
+arch woodfloor2
+x 11
+y 11
+end
+arch wwall_2_1_2
+x 11
+y 11
+end
+arch woodfloor2
+x 11
+y 12
+end
+arch barrel
+x 11
+y 12
+end
+arch woodfloor2
+x 11
+y 13
+end
+arch table_1x2
+x 11
+y 13
+end
+arch woodfloor2
+x 11
+y 14
+end
+arch woodfloor2
+x 11
+y 15
+end
+arch woodfloor2
+x 11
+y 16
+end
+arch wwall_2_1_2
+x 11
+y 16
+end
+arch grass_only
+x 11
+y 17
+end
+arch grass_only
+x 11
+y 18
+end
+arch grass_only
+x 12
+end
+arch grass_only
+x 12
+y 1
+end
+arch woodfloor2
+x 12
+y 2
+end
+arch wwall_2_1_2
+x 12
+y 2
+end
+arch woodfloor2
+x 12
+y 3
+end
+arch woodfloor2
+x 12
+y 4
+end
+arch woodfloor2
+x 12
+y 5
+end
+arch chair_1.3
+x 12
+y 5
+end
+arch woodfloor2
+x 12
+y 6
+end
+arch chair_1.3
+x 12
+y 6
+end
+arch woodfloor2
+x 12
 y 7
 end
+arch woodfloor2
+x 12
+y 8
+end
+arch wwall_1_4
+x 12
+y 8
+end
+arch woodfloor2
+x 12
+y 9
+end
+arch woodfloor2
+x 12
+y 10
+end
+arch woodfloor2
+x 12
+y 11
+end
+arch wwall_2_2_3
+x 12
+y 11
+end
+arch woodfloor2
+x 12
+y 12
+end
+arch wwall_2_1_1
+x 12
+y 12
+end
+arch woodfloor2
+x 12
+y 13
+end
+arch wwall_2_1_1
+x 12
+y 13
+end
+arch woodfloor2
+x 12
+y 14
+end
+arch wwall_2_1_1
+x 12
+y 14
+end
+arch woodfloor2
+x 12
+y 15
+end
+arch wwall_2_1_1
+x 12
+y 15
+end
+arch woodfloor2
+x 12
+y 16
+end
+arch wwall_3_1
+x 12
+y 16
+end
+arch grass_only
+x 12
+y 17
+end
+arch grass_only
+x 12
+y 18
+end
+arch grass_only
+x 13
+end
+arch grass_only
+x 13
+y 1
+end
+arch woodfloor2
+x 13
+y 2
+end
+arch wwall_win2
+x 13
+y 2
+end
+arch woodfloor2
+x 13
+y 3
+end
+arch woodfloor2
+x 13
+y 4
+end
+arch wwall_0
+x 13
+y 4
+end
+arch woodfloor2
+x 13
+y 5
+end
+arch woodfloor2
+x 13
+y 6
+end
+arch wwall_0
+x 13
+y 6
+end
+arch woodfloor2
+x 13
+y 7
+end
+arch woodfloor2
+x 13
+y 8
+end
+arch wwall_2_1_2
+x 13
+y 8
+end
+arch woodfloor2
+x 13
+y 9
+end
+arch woodfloor2
+x 13
+y 10
+end
+arch woodfloor2
+x 13
+y 11
+end
+arch woodfloor2
+x 13
+y 12
+end
+arch woodfloor2
+x 13
+y 13
+end
+arch woodfloor2
+x 13
+y 14
+end
+arch woodfloor2
+x 13
+y 15
+end
+arch woodfloor2
+x 13
+y 16
+end
+arch wwall_1_3
+x 13
+y 16
+end
+arch dungeon_magic
+x 13
+y 17
+end
+arch grass_only
+x 13
+y 17
+move_block all
+end
+arch grass_only
+x 13
+y 18
+end
+arch grass_only
+x 14
+end
+arch grass_only
+x 14
+y 1
+end
+arch woodfloor2
+x 14
+y 2
+end
+arch wwall_2_1_2
+x 14
+y 2
+end
+arch woodfloor2
+x 14
+y 3
+end
+arch woodfloor2
+x 14
+y 4
+end
+arch woodfloor2
+x 14
+y 5
+end
+arch magic_mouth
+msg
+You see an Angel appear before you The Angle says:
+"Stop brave adventurer...do not take what is not your from this lonely hovel.  The owners have gone through great hardships.  So if you do feel the need to take anything YOU WILL DIE!"
+endmsg
+x 14
+y 6
+end
+arch woodfloor2
+x 14
+y 6
+end
+arch woodfloor2
+x 14
+y 7
+end
+arch woodfloor2
+x 14
+y 8
+end
+arch wwall_2_1_2
+x 14
+y 8
+end
+arch woodfloor2
+x 14
+y 9
+end
+arch table_4
+x 14
+y 9
+end
+arch woodfloor2
+x 14
+y 10
+end
+arch woodfloor2
+x 14
+y 11
+end
+arch woodfloor2
+x 14
+y 12
+end
+arch woodfloor2
+x 14
+y 13
+end
+arch woodfloor2
+x 14
+y 14
+end
+arch woodfloor2
+x 14
+y 15
+end
+arch woodfloor2
+x 14
+y 16
+end
+arch oakdoor_2
+slaying /world/world_121_117
+hp 44
+sp 12
+x 14
+y 16
+end
+arch dungeon_magic
+x 14
+y 17
+end
+arch grass_only
+x 14
+y 17
+move_block all
+end
+arch grass_only
+x 14
+y 18
+end
+arch grass_only
+x 15
+end
+arch grass_only
+x 15
+y 1
+end
+arch woodfloor2
+x 15
+y 2
+end
+arch wwall_2_1_2
+x 15
+y 2
+end
+arch woodfloor2
+x 15
+y 3
+end
+arch table_1x2
+x 15
+y 3
+end
+arch woodfloor2
+x 15
+y 4
+end
+arch woodfloor2
+x 15
+y 5
+end
+arch woodfloor2
+x 15
+y 6
+end
+arch woodfloor2
+x 15
+y 7
+end
+arch table_3
+x 15
+y 7
+end
+arch woodfloor2
+x 15
+y 8
+end
+arch wwall_2_1_2
+x 15
+y 8
+end
+arch woodfloor2
+x 15
+y 9
+end
+arch chair_1.1
+x 15
+y 9
+end
 arch c_man
 name The Undertaker
 msg
 @match *
 Can I make you something to fit?
 endmsg
-x 4
-y 7
-end
-arch woodfloor2
-x 4
-y 8
-end
-arch woodfloor2
-x 4
+x 15
 y 9
 end
-arch wall_2_1_2
-x 4
-y 9
-end
-arch blocked
-x 4
+arch woodfloor2
+x 15
 y 10
 end
-arch blocked
-x 5
+arch woodfloor2
+x 15
+y 11
 end
-arch blocked
-x 5
+arch woodfloor2
+x 15
+y 12
+end
+arch woodfloor2
+x 15
+y 13
+end
+arch woodfloor2
+x 15
+y 14
+end
+arch woodfloor2
+x 15
+y 15
+end
+arch woodfloor2
+x 15
+y 16
+end
+arch wwall_1_4
+x 15
+y 16
+end
+arch dungeon_magic
+x 15
+y 17
+end
+arch grass_only
+x 15
+y 17
+move_block all
+end
+arch grass_only
+x 15
+y 18
+end
+arch grass_only
+x 16
+end
+arch grass_only
+x 16
 y 1
 end
-arch blocked
-x 5
+arch woodfloor2
+x 16
 y 2
 end
-arch blocked
-x 5
+arch wwall_2_2_3
+x 16
+y 2
+end
+arch woodfloor2
+x 16
+y 3
+end
+arch wwall_2_1_1
+x 16
 y 3
 end
 arch woodfloor2
-x 5
+x 16
 y 4
 end
-arch wall_2_1_2
-x 5
+arch wwall_2_1_1
+x 16
 y 4
 end
 arch woodfloor2
-x 5
+x 16
 y 5
 end
-arch gravestone2
-x 5
+arch wwall_2_1_1
+x 16
 y 5
 end
 arch woodfloor2
-x 5
+x 16
+y 6
+end
+arch wwall_2_1_1
+x 16
 y 6
 end
 arch woodfloor2
-x 5
+x 16
 y 7
 end
-arch table_4
-x 5
+arch wwall_2_1_1
+x 16
 y 7
 end
 arch woodfloor2
-x 5
+x 16
+y 8
+end
+arch wwall_3_4
+x 16
 y 8
 end
 arch woodfloor2
-x 5
+x 16
 y 9
 end
-arch wall_2_1_2
-x 5
+arch wwall_win1
+x 16
 y 9
 end
-arch blocked
-x 5
+arch woodfloor2
+x 16
 y 10
 end
-arch blocked
-x 6
-end
-arch blocked
-x 6
-y 1
-end
-arch blocked
-x 6
-y 2
-end
-arch blocked
-x 6
-y 3
-end
-arch woodfloor2
-x 6
-y 4
-end
-arch wall_2_2_3
-x 6
-y 4
-end
-arch woodfloor2
-x 6
-y 5
-end
-arch wall_2_2_1
-x 6
-y 5
-end
-arch woodfloor2
-x 6
-y 6
-end
-arch woodfloor2
-x 6
-y 7
-end
-arch woodfloor2
-x 6
-y 8
-end
-arch woodfloor2
-x 6
-y 9
-end
-arch wall_2_1_2
-x 6
-y 9
-end
-arch blocked
-x 6
+arch wwall_2_1_1
+x 16
 y 10
 end
-arch blocked
-x 7
+arch woodfloor2
+x 16
+y 11
 end
-arch blocked
-x 7
+arch wwall_2_1_1
+x 16
+y 11
+end
+arch woodfloor2
+x 16
+y 12
+end
+arch wwall_2_1_1
+x 16
+y 12
+end
+arch woodfloor2
+x 16
+y 13
+end
+arch wwall_2_1_1
+x 16
+y 13
+end
+arch woodfloor2
+x 16
+y 14
+end
+arch wwall_2_1_1
+x 16
+y 14
+end
+arch woodfloor2
+x 16
+y 15
+end
+arch wwall_2_1_1
+x 16
+y 15
+end
+arch woodfloor2
+x 16
+y 16
+end
+arch wwall_2_2_4
+x 16
+y 16
+end
+arch grass_only
+x 16
+y 17
+end
+arch grass_only
+x 16
+y 18
+end
+arch grass_only
+x 17
+end
+arch grass_only
+x 17
 y 1
 end
-arch blocked
-x 7
+arch grass_only
+x 17
 y 2
 end
-arch blocked
-x 7
+arch grass_only
+x 17
 y 3
 end
-arch blocked
-x 7
+arch grass_only
+x 17
 y 4
 end
-arch woodfloor2
-x 7
+arch grass_only
+x 17
 y 5
 end
-arch wall_2_1_2
-x 7
-y 5
-end
-arch woodfloor2
-x 7
+arch grass_only
+x 17
 y 6
 end
-arch woodfloor2
-x 7
+arch grass_only
+x 17
 y 7
 end
-arch woodfloor2
-x 7
+arch grass_only
+x 17
 y 8
 end
-arch woodfloor2
-x 7
+arch grass_only
+x 17
 y 9
 end
-arch wall_2_1_2
-x 7
-y 9
-end
-arch blocked
-x 7
+arch grass_only
+x 17
 y 10
 end
-arch blocked
-x 8
+arch grass_only
+x 17
+y 11
 end
-arch blocked
-x 8
+arch grass_only
+x 17
+y 12
+end
+arch grass_only
+x 17
+y 13
+end
+arch grass_only
+x 17
+y 14
+end
+arch grass_only
+x 17
+y 15
+end
+arch grass_only
+x 17
+y 16
+end
+arch grass_only
+x 17
+y 17
+end
+arch grass_only
+x 17
+y 18
+end
+arch cobblestones2
+x 18
+end
+arch cobblestones2
+x 18
 y 1
 end
-arch blocked
-x 8
+arch cobblestones2
+x 18
 y 2
 end
-arch blocked
-x 8
+arch cobblestones2
+x 18
 y 3
 end
-arch blocked
-x 8
+arch cobblestones2
+x 18
 y 4
 end
-arch woodfloor2
-x 8
+arch cobblestones2
+x 18
 y 5
 end
-arch wall_2_1_2
-x 8
-y 5
-end
-arch woodfloor2
-x 8
+arch cobblestones2
+x 18
 y 6
 end
-arch woodfloor2
-x 8
+arch cobblestones2
+x 18
 y 7
 end
-arch woodfloor2
-x 8
+arch cobblestones2
+x 18
 y 8
 end
-arch gravestone
-x 8
-y 8
-end
-arch woodfloor2
-x 8
+arch cobblestones2
+x 18
 y 9
 end
-arch wall_2_1_2
-x 8
-y 9
-end
-arch blocked
-x 8
+arch cobblestones2
+x 18
 y 10
 end
-arch blocked
-x 9
+arch cobblestones2
+x 18
+y 11
 end
-arch blocked
-x 9
-y 1
+arch cobblestones2
+x 18
+y 12
 end
-arch blocked
-x 9
-y 2
+arch cobblestones2
+x 18
+y 13
 end
-arch woodfloor2
-x 9
-y 3
+arch cobblestones2
+x 18
+y 14
 end
-arch wall_2_2_2
-x 9
-y 3
+arch cobblestones2
+x 18
+y 15
 end
-arch woodfloor2
-x 9
-y 4
+arch cobblestones2
+x 18
+y 16
 end
-arch wall_2_1_1
-x 9
-y 4
+arch cobblestones2
+x 18
+y 17
 end
-arch woodfloor2
-x 9
-y 5
-end
-arch wall_2_2_4
-x 9
-y 5
-end
-arch woodfloor2
-x 9
-y 6
-end
-arch woodfloor2
-x 9
-y 7
-end
-arch woodfloor2
-x 9
-y 8
-end
-arch gravestone
-x 9
-y 8
-end
-arch woodfloor2
-x 9
-y 9
-end
-arch wall_2_1_2
-x 9
-y 9
-end
-arch blocked
-x 9
-y 10
-end
-arch blocked
-x 10
-end
-arch woodfloor2
-x 10
-y 1
-end
-arch wall_2_2_2
-x 10
-y 1
-end
-arch woodfloor2
-x 10
-y 2
-end
-arch wall_2_1_1
-x 10
-y 2
-end
-arch woodfloor2
-x 10
-y 3
-end
-arch wall_2_2_4
-x 10
-y 3
-end
-arch woodfloor2
-x 10
-y 4
-end
-arch woodfloor2
-x 10
-y 5
-end
-arch woodfloor2
-x 10
-y 6
-end
-arch woodfloor2
-x 10
-y 7
-end
-arch woodfloor2
-x 10
-y 8
-end
-arch gravestone
-x 10
-y 8
-end
-arch woodfloor2
-x 10
-y 9
-end
-arch wall_2_1_2
-x 10
-y 9
-end
-arch blocked
-x 10
-y 10
-end
-arch blocked
-x 11
-end
-arch woodfloor2
-x 11
-y 1
-end
-arch wall_2_1_2
-x 11
-y 1
-end
-arch woodfloor2
-x 11
-y 2
-end
-arch oakdoor
-slaying /world/world_121_117
-hp 44
-sp 12
-x 11
-y 2
-end
-arch woodfloor2
-x 11
-y 3
-end
-arch woodfloor2
-x 11
-y 4
-end
-arch woodfloor2
-x 11
-y 5
-end
-arch woodfloor2
-x 11
-y 6
-end
-arch woodfloor2
-x 11
-y 7
-end
-arch woodfloor2
-x 11
-y 8
-end
-arch gravestone
-x 11
-y 8
-end
-arch woodfloor2
-x 11
-y 9
-end
-arch wall_2_1_2
-x 11
-y 9
-end
-arch blocked
-x 11
-y 10
-end
-arch blocked
-x 12
-end
-arch woodfloor2
-x 12
-y 1
-end
-arch wall_2_2_3
-x 12
-y 1
-end
-arch woodfloor2
-x 12
-y 2
-end
-arch wall_2_1_1
-x 12
-y 2
-end
-arch woodfloor2
-x 12
-y 3
-end
-arch wall_2_1_1
-x 12
-y 3
-end
-arch woodfloor2
-x 12
-y 4
-end
-arch wall_2_1_1
-x 12
-y 4
-end
-arch woodfloor2
-x 12
-y 5
-end
-arch wall_2_1_1
-x 12
-y 5
-end
-arch woodfloor2
-x 12
-y 6
-end
-arch wall_2_1_1
-x 12
-y 6
-end
-arch woodfloor2
-x 12
-y 7
-end
-arch wall_2_1_1
-x 12
-y 7
-end
-arch woodfloor2
-x 12
-y 8
-end
-arch wall_2_1_1
-x 12
-y 8
-end
-arch woodfloor2
-x 12
-y 9
-end
-arch wall_2_2_4
-x 12
-y 9
-end
-arch blocked
-x 12
-y 10
-end
-arch blocked
-x 13
-end
-arch blocked
-x 13
-y 1
-end
-arch blocked
-x 13
-y 2
-end
-arch blocked
-x 13
-y 3
-end
-arch blocked
-x 13
-y 4
-end
-arch blocked
-x 13
-y 5
-end
-arch blocked
-x 13
-y 6
-end
-arch blocked
-x 13
-y 7
-end
-arch blocked
-x 13
-y 8
-end
-arch blocked
-x 13
-y 9
-end
-arch blocked
-x 13
-y 10
+arch cobblestones2
+x 18
+y 18
 end
diff --git a/world/world_121_117 b/world/world_121_117
index e20fca079..720707410 100644
--- a/world/world_121_117
+++ b/world/world_121_117
@@ -8,7 +8,7 @@ height 50
 enter_x 1
 enter_y 1
 msg
-Modified: 2012-07-23 leaf
+Modified: 2012-07-25 leaf
 endmsg
 outdoor 1
 tile_path_1 world_121_116
@@ -12593,8 +12593,8 @@ end
 arch minihouse
 name Herbert's Undertakers
 slaying ../navar_city/houses/herbertsundertakers
-hp 11
-sp 2
+hp 14
+sp 15
 x 44
 y 12
 end