diff --git a/navar_city/houses/charliesplace b/navar_city/houses/charliesplace
index 2ef2a0a3e..928c0eff9 100644
--- a/navar_city/houses/charliesplace
+++ b/navar_city/houses/charliesplace
@@ -2,110 +2,187 @@ arch map
 name Charlie's Place
 difficulty 11
 region navar
-width 15
-height 11
-enter_x 12
-enter_y 5
+width 17
+height 21
+enter_x 3
+enter_y 10
 msg
 Created:  2012-05-19 Rick Tanner
-Modified: 2012-05-19 Rick Tanner
+Modified: 2012-07-15 Rick Tanner
 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 cobblestones2
+y 19
+end
+arch cobblestones2
+y 20
+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 woodfloor2
+arch grass_only
 x 1
 y 3
 end
-arch wall_2_2_2
-x 1
-y 3
-end
-arch woodfloor2
+arch grass_only
 x 1
 y 4
 end
-arch wall_2_1_1
-x 1
-y 4
-end
-arch woodfloor2
+arch grass_only
 x 1
 y 5
 end
-arch wall_2_2_1
-x 1
-y 5
-end
-arch blocked
+arch grass_only
 x 1
 y 6
 end
-arch blocked
+arch grass_only
 x 1
 y 7
 end
-arch blocked
+arch grass_only
 x 1
 y 8
 end
-arch blocked
+arch dungeon_magic
 x 1
 y 9
 end
-arch blocked
+arch grass_only
+x 1
+y 9
+move_block all
+end
+arch dungeon_magic
 x 1
 y 10
 end
-arch blocked
+arch grass_only
+x 1
+y 10
+move_block all
+end
+arch dungeon_magic
+x 1
+y 11
+end
+arch grass_only
+x 1
+y 11
+move_block all
+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 1
+y 19
+end
+arch grass_only
+x 1
+y 20
+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 woodwall_2_2_2
 x 2
 y 2
 end
@@ -113,7 +190,7 @@ arch woodfloor2
 x 2
 y 3
 end
-arch wall_2_1_2
+arch woodwall_2_1_1
 x 2
 y 3
 end
@@ -121,117 +198,271 @@ arch woodfloor2
 x 2
 y 4
 end
+arch woodwall_2_1_1
+x 2
+y 4
+end
+arch woodfloor2
+x 2
+y 5
+end
+arch woodwall_2_1_1
+x 2
+y 5
+end
+arch woodfloor2
+x 2
+y 6
+end
+arch woodwall_win1
+x 2
+y 6
+end
+arch woodfloor2
+x 2
+y 7
+end
+arch woodwall_2_1_1
+x 2
+y 7
+end
+arch woodfloor2
+x 2
+y 8
+end
+arch woodwall_3_2
+x 2
+y 8
+end
+arch woodfloor2
+x 2
+y 9
+end
+arch woodwall_1_2
+x 2
+y 9
+end
+arch woodfloor2
+x 2
+y 10
+end
+arch oakdoor_1
+slaying /world/world_121_117
+hp 44
+sp 11
+x 2
+y 10
+end
+arch woodfloor2
+x 2
+y 11
+end
+arch woodwall_1_1
+x 2
+y 11
+end
+arch woodfloor2
+x 2
+y 12
+end
+arch woodwall_3_2
+x 2
+y 12
+end
+arch woodfloor2
+x 2
+y 13
+end
+arch woodwall_2_1_1
+x 2
+y 13
+end
+arch woodfloor2
+x 2
+y 14
+end
+arch woodwall_win1
+x 2
+y 14
+end
+arch woodfloor2
+x 2
+y 15
+end
+arch woodwall_2_1_1
+x 2
+y 15
+end
+arch woodfloor2
+x 2
+y 16
+end
+arch woodwall_2_1_1
+x 2
+y 16
+end
+arch woodfloor2
+x 2
+y 17
+end
+arch woodwall_2_1_1
+x 2
+y 17
+end
+arch woodfloor2
+x 2
+y 18
+end
+arch woodwall_2_2_1
+x 2
+y 18
+end
+arch grass_only
+x 2
+y 19
+end
+arch grass_only
+x 2
+y 20
+end
+arch grass_only
+x 3
+end
+arch grass_only
+x 3
+y 1
+end
+arch woodfloor2
+x 3
+y 2
+end
+arch woodwall_2_1_2
+x 3
+y 2
+end
+arch woodfloor2
+x 3
+y 3
+end
+arch woodfloor2
+x 3
+y 4
+end
+arch locked_brown_door1
+slaying charlie-treasure1
+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 chest
-x 2
-y 4
+x 3
+y 7
+arch darkgray_key
+slaying charlie-exit1
+end
+arch medium_potion_restoration
+end
+arch potion_heal
+arch spell_heal
+end
+end
+arch potion_magic
+arch spell_regenerate_spellpoints
+end
+end
 end
 arch woodfloor2
-x 2
-y 5
-end
-arch wall_2_1_2
-x 2
-y 5
-end
-arch blocked
-x 2
-y 6
-end
-arch blocked
-x 2
-y 7
-end
-arch blocked
-x 2
+x 3
 y 8
 end
-arch blocked
-x 2
+arch woodwall_2_1_2
+x 3
+y 8
+end
+arch woodfloor2
+x 3
 y 9
 end
-arch blocked
-x 2
+arch woodfloor2
+x 3
 y 10
 end
-arch blocked
+arch woodfloor2
 x 3
+y 11
 end
-arch blocked
+arch woodfloor2
 x 3
+y 12
+end
+arch woodwall_2_1_2
+x 3
+y 12
+end
+arch woodfloor2
+x 3
+y 13
+end
+arch woodfloor2
+x 3
+y 14
+end
+arch woodfloor2
+x 3
+y 15
+end
+arch gate_closed_1
+x 3
+y 15
+connected 10
+end
+arch woodfloor2
+x 3
+y 16
+end
+arch woodfloor2
+x 3
+y 17
+end
+arch woodfloor2
+x 3
+y 18
+end
+arch woodwall_2_1_2
+x 3
+y 18
+end
+arch grass_only
+x 3
+y 19
+end
+arch grass_only
+x 3
+y 20
+end
+arch grass_only
+x 4
+end
+arch grass_only
+x 4
 y 1
 end
-arch blocked
-x 3
+arch woodfloor2
+x 4
 y 2
 end
-arch woodfloor2
-x 3
-y 3
-end
-arch wall_2_1_2
-x 3
-y 3
-end
-arch woodfloor2
-x 3
-y 4
-end
-arch ghost
-x 3
-y 4
-end
-arch woodfloor2
-x 3
-y 5
-end
-arch wall_2_2_3
-x 3
-y 5
-end
-arch woodfloor2
-x 3
-y 6
-end
-arch wall_2_1_1
-x 3
-y 6
-end
-arch woodfloor2
-x 3
-y 7
-end
-arch wall_2_1_1
-x 3
-y 7
-end
-arch woodfloor2
-x 3
-y 8
-end
-arch wall_2_1_1
-x 3
-y 8
-end
-arch woodfloor2
-x 3
-y 9
-end
-arch wall_2_2_1
-x 3
-y 9
-end
-arch blocked
-x 3
-y 10
-end
-arch blocked
-x 4
-end
-arch blocked
-x 4
-y 1
-end
-arch blocked
+arch woodwall_2_1_2
 x 4
 y 2
 end
@@ -239,62 +470,135 @@ arch woodfloor2
 x 4
 y 3
 end
-arch wall_2_1_2
-x 4
-y 3
-end
 arch woodfloor2
 x 4
 y 4
 end
+arch woodwall_2_2_2
+x 4
+y 4
+end
+arch woodfloor2
+x 4
+y 5
+end
+arch woodwall_1_2
+x 4
+y 5
+end
+arch woodfloor2
+x 4
+y 6
+end
+arch locked_brown_door2
+slaying charlie-exit1
+x 4
+y 6
+end
+arch woodfloor2
+x 4
+y 7
+end
+arch woodwall_1_1
+x 4
+y 7
+end
+arch woodfloor2
+x 4
+y 8
+end
+arch woodwall_2_2_4
+x 4
+y 8
+end
+arch woodfloor2
+x 4
+y 9
+end
+arch gravestone2
+x 4
+y 9
+end
+arch woodfloor2
+x 4
+y 10
+end
+arch woodfloor2
+x 4
+y 11
+end
+arch gravestone2
+x 4
+y 11
+end
+arch woodfloor2
+x 4
+y 12
+end
+arch woodwall_2_1_2
+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 woodwall_1_4
+x 4
+y 15
+end
+arch woodfloor2
+x 4
+y 16
+end
+arch woodfloor2
+x 4
+y 16
+end
 arch skeleton
 x 4
-y 4
+y 16
 end
 arch woodfloor2
 x 4
-y 5
+y 17
 end
 arch woodfloor2
 x 4
-y 6
+y 18
 end
-arch skeleton
+arch woodwall_2_1_2
 x 4
-y 6
+y 18
 end
-arch woodfloor2
+arch grass_only
 x 4
-y 7
+y 19
 end
-arch woodfloor2
+arch grass_only
 x 4
-y 8
+y 20
 end
-arch grimreaper
-x 4
-y 8
-end
-arch woodfloor2
-x 4
-y 9
-end
-arch wall_2_1_2
-x 4
-y 9
-end
-arch blocked
-x 4
-y 10
-end
-arch blocked
+arch grass_only
 x 5
 end
-arch blocked
+arch grass_only
 x 5
 y 1
 end
-arch blocked
+arch woodfloor2
+x 5
+y 2
+end
+arch woodwall_win2
 x 5
 y 2
 end
@@ -302,15 +606,11 @@ arch woodfloor2
 x 5
 y 3
 end
-arch wall_2_1_2
-x 5
-y 3
-end
 arch woodfloor2
 x 5
 y 4
 end
-arch skeleton
+arch woodwall_2_1_2
 x 5
 y 4
 end
@@ -318,304 +618,514 @@ arch woodfloor2
 x 5
 y 5
 end
-arch woodfloor2
-x 5
-y 6
-end
-arch woodfloor2
-x 5
-y 7
-end
-arch ghost
-x 5
-y 7
-end
-arch woodfloor2
-x 5
-y 8
-end
-arch woodfloor2
-x 5
-y 9
-end
-arch wall_2_1_2
-x 5
-y 9
-end
-arch blocked
-x 5
-y 10
-end
-arch blocked
-x 6
-end
-arch blocked
-x 6
-y 1
-end
-arch blocked
-x 6
-y 2
-end
-arch woodfloor2
-x 6
-y 3
-end
-arch wall_2_1_2
-x 6
-y 3
-end
-arch woodfloor2
-x 6
-y 4
-end
-arch skeleton
-x 6
-y 4
-end
-arch woodfloor2
-x 6
-y 5
-end
-arch skeleton
-x 6
-y 5
-end
-arch woodfloor2
-x 6
-y 6
-end
-arch woodfloor2
-x 6
-y 7
-end
-arch ghost
-x 6
-y 7
-end
-arch woodfloor2
-x 6
-y 8
-end
-arch ghost
-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
-y 10
-end
-arch blocked
-x 7
-end
-arch woodfloor2
-x 7
-y 1
-end
-arch wall_2_2_2
-x 7
-y 1
-end
-arch woodfloor2
-x 7
-y 2
-end
-arch wall_2_1_1
-x 7
-y 2
-end
-arch woodfloor2
-x 7
-y 3
-end
-arch wall_3_4
-x 7
-y 3
-end
-arch woodfloor2
-x 7
-y 4
-end
-arch wall_2_1_1
-x 7
-y 4
-end
-arch woodfloor2
-x 7
-y 5
-end
-arch wall_1_2
-x 7
-y 5
-end
-arch woodfloor2
-x 7
-y 6
-end
-arch door_look_2
-x 7
-y 6
-end
-arch woodfloor2
-x 7
-y 7
-end
-arch wall_1_1
-x 7
-y 7
-end
-arch woodfloor2
-x 7
-y 8
-end
-arch wall_2_1_1
-x 7
-y 8
-end
-arch woodfloor2
-x 7
-y 9
-end
-arch wall_3_1
-x 7
-y 9
-end
-arch blocked
-x 7
-y 10
-end
-arch blocked
-x 8
-end
-arch woodfloor2
-x 8
-y 1
-end
-arch wall_2_1_2
-x 8
-y 1
-end
-arch woodfloor2
-x 8
-y 2
-end
 arch gravestone
-x 8
+x 5
+y 5
+end
+arch woodfloor2
+x 5
+y 6
+end
+arch woodfloor2
+x 5
+y 7
+end
+arch woodfloor2
+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 woodwall_1_3
+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 woodwall_2_1_2
+x 5
+y 15
+end
+arch woodfloor2
+x 5
+y 16
+end
+arch woodfloor2
+x 5
+y 17
+end
+arch woodfloor2
+x 5
+y 18
+end
+arch woodwall_2_1_2
+x 5
+y 18
+end
+arch grass_only
+x 5
+y 19
+end
+arch grass_only
+x 5
+y 20
+end
+arch grass_only
+x 6
+end
+arch grass_only
+x 6
+y 1
+end
+arch woodfloor2
+x 6
+y 2
+end
+arch woodwall_2_1_2
+x 6
 y 2
 end
 arch woodfloor2
-x 8
+x 6
 y 3
 end
 arch woodfloor2
-x 8
+x 6
 y 4
 end
-arch chair
-x 8
+arch woodwall_2_1_2
+x 6
 y 4
 end
+arch woodfloor2
+x 6
+y 5
+end
+arch woodfloor2
+x 6
+y 6
+end
+arch woodfloor2
+x 6
+y 7
+end
+arch chair
+x 6
+y 7
+end
 arch fatman
 name Charlie
 msg
 @match *
 What would you like your gravestone to read?
 endmsg
-x 8
-y 4
+x 6
+y 7
+random_movement 0
 end
 arch woodfloor2
-x 8
-y 5
+x 6
+y 8
 end
 arch table_4
-x 8
-y 5
-end
-arch woodfloor2
-x 8
-y 6
-end
-arch woodfloor2
-x 8
-y 7
-end
-arch woodfloor2
-x 8
-y 8
-end
-arch gravestone2
-x 8
+x 6
 y 8
 end
 arch woodfloor2
-x 8
+x 6
 y 9
 end
-arch wall_2_1_2
-x 8
-y 9
-end
-arch blocked
-x 8
+arch woodfloor2
+x 6
 y 10
 end
-arch blocked
-x 9
+arch woodfloor2
+x 6
+y 11
 end
 arch woodfloor2
-x 9
-y 1
+x 6
+y 12
 end
-arch wall_2_1_2
-x 9
+arch door_2
+x 6
+y 12
+end
+arch woodfloor2
+x 6
+y 13
+end
+arch woodfloor2
+x 6
+y 14
+end
+arch woodfloor2
+x 6
+y 15
+end
+arch woodwall_2_1_2
+x 6
+y 15
+end
+arch woodfloor2
+x 6
+y 16
+end
+arch woodfloor2
+x 6
+y 17
+end
+arch woodfloor2
+x 6
+y 18
+end
+arch woodwall_2_1_2
+x 6
+y 18
+end
+arch grass_only
+x 6
+y 19
+end
+arch grass_only
+x 6
+y 20
+end
+arch grass_only
+x 7
+end
+arch grass_only
+x 7
 y 1
 end
 arch woodfloor2
-x 9
+x 7
 y 2
 end
+arch woodwall_2_1_2
+x 7
+y 2
+end
+arch woodfloor2
+x 7
+y 3
+end
+arch woodfloor2
+x 7
+y 4
+end
+arch woodwall_2_1_2
+x 7
+y 4
+end
+arch woodfloor2
+x 7
+y 5
+end
 arch gravestone
-x 9
-y 2
-end
-arch woodfloor2
-x 9
-y 3
-end
-arch woodfloor2
-x 9
-y 4
-end
-arch woodfloor2
-x 9
+x 7
 y 5
 end
+arch woodfloor2
+x 7
+y 6
+end
+arch woodfloor2
+x 7
+y 7
+end
+arch woodfloor2
+x 7
+y 8
+end
 arch chair_1.1
-x 9
-y 5
-end
-arch woodfloor2
-x 9
-y 6
-end
-arch woodfloor2
-x 9
-y 7
-end
-arch woodfloor2
-x 9
+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 gravestone2
+x 7
+y 11
+end
+arch woodfloor2
+x 7
+y 12
+end
+arch woodwall_1_4
+x 7
+y 12
+end
+arch woodfloor2
+x 7
+y 13
+end
+arch woodfloor2
+x 7
+y 14
+end
+arch button_handle
+x 7
+y 14
+connected 10
+end
+arch woodfloor2
+x 7
+y 15
+end
+arch woodwall_2_1_2
+x 7
+y 15
+end
+arch woodfloor2
+x 7
+y 16
+end
+arch woodfloor2
+x 7
+y 17
+end
+arch woodfloor2
+x 7
+y 18
+end
+arch woodwall_2_1_2
+x 7
+y 18
+end
+arch grass_only
+x 7
+y 19
+end
+arch grass_only
+x 7
+y 20
+end
+arch grass_only
+x 8
+end
+arch grass_only
+x 8
+y 1
+end
+arch woodfloor2
+x 8
+y 2
+end
+arch woodwall_2_1_2
+x 8
+y 2
+end
+arch woodfloor2
+x 8
+y 3
+end
+arch woodfloor2
+x 8
+y 4
+end
+arch woodwall_2_2_3
+x 8
+y 4
+end
+arch woodfloor2
+x 8
+y 5
+end
+arch woodwall_2_1_1
+x 8
+y 5
+end
+arch woodfloor2
+x 8
+y 6
+end
+arch woodwall_3_2
+x 8
+y 6
+end
+arch woodfloor2
+x 8
+y 7
+end
+arch woodwall_2_1_1
+x 8
+y 7
+end
+arch woodfloor2
+x 8
+y 8
+end
+arch woodwall_2_1_1
+x 8
+y 8
+end
+arch woodfloor2
+x 8
+y 9
+end
+arch woodwall_2_1_1
+x 8
+y 9
+end
+arch woodfloor2
+x 8
+y 10
+end
+arch woodwall_2_1_1
+x 8
+y 10
+end
+arch woodfloor2
+x 8
+y 11
+end
+arch woodwall_2_1_1
+x 8
+y 11
+end
+arch woodfloor2
+x 8
+y 12
+end
+arch woodwall_4
+x 8
+y 12
+end
+arch woodfloor2
+x 8
+y 13
+end
+arch woodwall_2_1_1
+x 8
+y 13
+end
+arch woodfloor2
+x 8
+y 14
+end
+arch woodwall_2_1_1
+x 8
+y 14
+end
+arch woodfloor2
+x 8
+y 15
+end
+arch woodwall_2_2_4
+x 8
+y 15
+end
+arch woodfloor2
+x 8
+y 16
+end
+arch woodfloor2
+x 8
+y 17
+end
+arch woodfloor2
+x 8
+y 17
+end
+arch skeleton
+x 8
+y 17
+end
+arch woodfloor2
+x 8
+y 18
+end
+arch woodwall_win2
+x 8
+y 18
+end
+arch grass_only
+x 8
+y 19
+end
+arch grass_only
+x 8
+y 20
+end
+arch grass_only
+x 9
+end
+arch grass_only
+x 9
+y 1
+end
+arch woodfloor2
+x 9
+y 2
+end
+arch woodwall_2_1_2
+x 9
+y 2
+end
+arch woodfloor2
+x 9
+y 3
+end
+arch woodfloor2
+x 9
+y 4
+end
+arch woodfloor2
+x 9
+y 5
+end
+arch woodfloor2
+x 9
+y 6
+end
+arch woodwall_1_3
+x 9
+y 6
+end
+arch woodfloor2
+x 9
+y 7
+end
+arch woodfloor2
+x 9
+y 8
+end
+arch ghost
 x 9
 y 8
 end
@@ -623,22 +1133,78 @@ arch woodfloor2
 x 9
 y 9
 end
-arch wall_2_1_2
-x 9
-y 9
-end
-arch blocked
+arch woodfloor2
 x 9
 y 10
 end
-arch blocked
-x 10
+arch woodfloor2
+x 9
+y 11
 end
 arch woodfloor2
-x 10
-y 1
+x 9
+y 11
 end
-arch wall_2_2_3
+arch ghost
+x 9
+y 11
+end
+arch woodfloor2
+x 9
+y 12
+end
+arch woodwall_2_1_2
+x 9
+y 12
+end
+arch woodfloor2
+x 9
+y 13
+end
+arch woodfloor2
+x 9
+y 13
+end
+arch skeleton
+x 9
+y 13
+end
+arch woodfloor2
+x 9
+y 14
+end
+arch woodfloor2
+x 9
+y 15
+end
+arch woodfloor2
+x 9
+y 16
+end
+arch woodfloor2
+x 9
+y 17
+end
+arch woodfloor2
+x 9
+y 18
+end
+arch woodwall_2_1_2
+x 9
+y 18
+end
+arch grass_only
+x 9
+y 19
+end
+arch grass_only
+x 9
+y 20
+end
+arch grass_only
+x 10
+end
+arch grass_only
 x 10
 y 1
 end
@@ -646,7 +1212,7 @@ arch woodfloor2
 x 10
 y 2
 end
-arch wall_2_2_1
+arch woodwall_2_1_2
 x 10
 y 2
 end
@@ -654,10 +1220,6 @@ arch woodfloor2
 x 10
 y 3
 end
-arch rock
-x 10
-y 3
-end
 arch woodfloor2
 x 10
 y 4
@@ -670,6 +1232,10 @@ arch woodfloor2
 x 10
 y 6
 end
+arch door_2
+x 10
+y 6
+end
 arch woodfloor2
 x 10
 y 7
@@ -678,26 +1244,78 @@ arch woodfloor2
 x 10
 y 8
 end
-arch gravestone2
-x 10
-y 8
-end
 arch woodfloor2
 x 10
 y 9
 end
-arch wall_2_1_2
-x 10
-y 9
-end
-arch blocked
+arch woodfloor2
 x 10
 y 10
 end
-arch blocked
+arch woodfloor2
+x 10
+y 10
+end
+arch ghost
+x 10
+y 10
+end
+arch woodfloor2
+x 10
+y 11
+end
+arch woodfloor2
+x 10
+y 12
+end
+arch woodwall_2_1_2
+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 woodfloor2
+x 10
+y 16
+end
+arch woodfloor2
+x 10
+y 17
+end
+arch woodfloor2
+x 10
+y 18
+end
+arch woodwall_2_1_2
+x 10
+y 18
+end
+arch grass_only
+x 10
+y 19
+end
+arch grass_only
+x 10
+y 20
+end
+arch grass_only
 x 11
 end
-arch blocked
+arch grass_only
 x 11
 y 1
 end
@@ -705,7 +1323,7 @@ arch woodfloor2
 x 11
 y 2
 end
-arch wall_2_1_2
+arch woodwall_win2
 x 11
 y 2
 end
@@ -713,10 +1331,6 @@ arch woodfloor2
 x 11
 y 3
 end
-arch rock
-x 11
-y 3
-end
 arch woodfloor2
 x 11
 y 4
@@ -729,6 +1343,10 @@ arch woodfloor2
 x 11
 y 6
 end
+arch woodwall_1_4
+x 11
+y 6
+end
 arch woodfloor2
 x 11
 y 7
@@ -737,7 +1355,7 @@ arch woodfloor2
 x 11
 y 8
 end
-arch wall_2_2_2
+arch ghost
 x 11
 y 8
 end
@@ -745,18 +1363,70 @@ arch woodfloor2
 x 11
 y 9
 end
-arch wall_2_2_4
-x 11
-y 9
-end
-arch blocked
+arch woodfloor2
 x 11
 y 10
 end
-arch blocked
+arch woodfloor2
+x 11
+y 11
+end
+arch woodfloor2
+x 11
+y 12
+end
+arch woodwall_1_3
+x 11
+y 12
+end
+arch woodfloor2
+x 11
+y 13
+end
+arch woodfloor2
+x 11
+y 14
+end
+arch woodfloor2
+x 11
+y 15
+end
+arch woodfloor2
+x 11
+y 15
+end
+arch skeleton
+x 11
+y 15
+end
+arch woodfloor2
+x 11
+y 16
+end
+arch woodfloor2
+x 11
+y 17
+end
+arch woodfloor2
+x 11
+y 18
+end
+arch woodwall_2_1_2
+x 11
+y 18
+end
+arch grass_only
+x 11
+y 19
+end
+arch grass_only
+x 11
+y 20
+end
+arch grass_only
 x 12
 end
-arch blocked
+arch grass_only
 x 12
 y 1
 end
@@ -764,7 +1434,7 @@ arch woodfloor2
 x 12
 y 2
 end
-arch wall_2_2_3
+arch woodwall_2_1_2
 x 12
 y 2
 end
@@ -772,34 +1442,19 @@ 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_2_1
-x 12
-y 4
-end
 arch woodfloor2
 x 12
 y 5
 end
-arch oakdoor
-slaying /world/world_121_117
-hp 44
-sp 11
-x 12
-y 5
-end
 arch woodfloor2
 x 12
 y 6
 end
-arch wall_2_2_2
+arch woodwall_2_1_2
 x 12
 y 6
 end
@@ -807,46 +1462,109 @@ 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_2_4
-x 12
-y 8
-end
-arch blocked
+arch woodfloor2
 x 12
 y 9
 end
-arch blocked
+arch woodfloor2
 x 12
 y 10
 end
-arch blocked
+arch woodfloor2
+x 12
+y 10
+end
+arch ghost
+x 12
+y 10
+end
+arch woodfloor2
+x 12
+y 11
+end
+arch woodfloor2
+x 12
+y 12
+end
+arch door_2
+x 12
+y 12
+end
+arch woodfloor2
+x 12
+y 13
+end
+arch woodfloor2
+x 12
+y 14
+end
+arch woodfloor2
+x 12
+y 15
+end
+arch woodfloor2
+x 12
+y 16
+end
+arch woodfloor2
+x 12
+y 17
+end
+arch woodfloor2
+x 12
+y 17
+end
+arch skeleton
+x 12
+y 17
+end
+arch woodfloor2
+x 12
+y 18
+end
+arch woodwall_2_1_2
+x 12
+y 18
+end
+arch grass_only
+x 12
+y 19
+end
+arch grass_only
+x 12
+y 20
+end
+arch grass_only
 x 13
 end
-arch blocked
+arch grass_only
 x 13
 y 1
 end
-arch blocked
+arch woodfloor2
 x 13
 y 2
 end
-arch blocked
+arch woodwall_2_1_2
+x 13
+y 2
+end
+arch woodfloor2
 x 13
 y 3
 end
-arch woodfloor2
+arch grimreaper
 x 13
-y 4
+y 3
+arch brown_key
+slaying charlie-treasure1
 end
-arch wall_2_2_3
+end
+arch woodfloor2
 x 13
 y 4
 end
@@ -854,74 +1572,404 @@ arch woodfloor2
 x 13
 y 5
 end
-arch wall_2_1_1
-x 13
-y 5
-end
 arch woodfloor2
 x 13
 y 6
 end
-arch wall_2_2_4
+arch woodwall_2_1_2
 x 13
 y 6
 end
-arch blocked
+arch woodfloor2
 x 13
 y 7
 end
-arch blocked
+arch woodfloor2
 x 13
 y 8
 end
-arch blocked
+arch ghost
+x 13
+y 8
+end
+arch woodfloor2
 x 13
 y 9
 end
-arch blocked
+arch woodfloor2
 x 13
 y 10
 end
-arch blocked
+arch woodfloor2
+x 13
+y 11
+end
+arch woodfloor2
+x 13
+y 12
+end
+arch woodwall_1_4
+x 13
+y 12
+end
+arch woodfloor2
+x 13
+y 13
+end
+arch woodfloor2
+x 13
+y 13
+end
+arch skeleton
+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 woodfloor2
+x 13
+y 17
+end
+arch woodfloor2
+x 13
+y 18
+end
+arch woodwall_2_1_2
+x 13
+y 18
+end
+arch grass_only
+x 13
+y 19
+end
+arch grass_only
+x 13
+y 20
+end
+arch grass_only
 x 14
 end
-arch blocked
+arch grass_only
 x 14
 y 1
 end
-arch blocked
+arch woodfloor2
 x 14
 y 2
 end
-arch blocked
+arch woodwall_2_2_3
+x 14
+y 2
+end
+arch woodfloor2
 x 14
 y 3
 end
-arch blocked
+arch woodwall_2_1_1
+x 14
+y 3
+end
+arch woodfloor2
 x 14
 y 4
 end
-arch blocked
+arch woodwall_win1
+x 14
+y 4
+end
+arch woodfloor2
 x 14
 y 5
 end
-arch blocked
+arch woodwall_2_1_1
+x 14
+y 5
+end
+arch woodfloor2
 x 14
 y 6
 end
-arch blocked
+arch woodwall_3_4
+x 14
+y 6
+end
+arch woodfloor2
 x 14
 y 7
 end
-arch blocked
+arch woodwall_2_1_1
+x 14
+y 7
+end
+arch woodfloor2
 x 14
 y 8
 end
-arch blocked
+arch woodwall_2_1_1
+x 14
+y 8
+end
+arch woodfloor2
 x 14
 y 9
 end
-arch blocked
+arch woodwall_2_1_1
+x 14
+y 9
+end
+arch woodfloor2
 x 14
 y 10
 end
+arch woodwall_win1
+x 14
+y 10
+end
+arch woodfloor2
+x 14
+y 11
+end
+arch woodwall_2_1_1
+x 14
+y 11
+end
+arch woodfloor2
+x 14
+y 12
+end
+arch woodwall_3_4
+x 14
+y 12
+end
+arch woodfloor2
+x 14
+y 13
+end
+arch woodwall_2_1_1
+x 14
+y 13
+end
+arch woodfloor2
+x 14
+y 14
+end
+arch woodwall_2_1_1
+x 14
+y 14
+end
+arch woodfloor2
+x 14
+y 15
+end
+arch woodwall_2_1_1
+x 14
+y 15
+end
+arch woodfloor2
+x 14
+y 16
+end
+arch woodwall_win1
+x 14
+y 16
+end
+arch woodfloor2
+x 14
+y 17
+end
+arch woodwall_2_1_1
+x 14
+y 17
+end
+arch woodfloor2
+x 14
+y 18
+end
+arch woodwall_2_2_4
+x 14
+y 18
+end
+arch grass_only
+x 14
+y 19
+end
+arch grass_only
+x 14
+y 20
+end
+arch grass_only
+x 15
+end
+arch grass_only
+x 15
+y 1
+end
+arch grass_only
+x 15
+y 2
+end
+arch grass_only
+x 15
+y 3
+end
+arch grass_only
+x 15
+y 4
+end
+arch grass_only
+x 15
+y 5
+end
+arch grass_only
+x 15
+y 6
+end
+arch grass_only
+x 15
+y 7
+end
+arch grass_only
+x 15
+y 8
+end
+arch grass_only
+x 15
+y 9
+end
+arch grass_only
+x 15
+y 10
+end
+arch grass_only
+x 15
+y 11
+end
+arch grass_only
+x 15
+y 12
+end
+arch grass_only
+x 15
+y 13
+end
+arch grass_only
+x 15
+y 14
+end
+arch grass_only
+x 15
+y 15
+end
+arch grass_only
+x 15
+y 16
+end
+arch grass_only
+x 15
+y 17
+end
+arch grass_only
+x 15
+y 18
+end
+arch grass_only
+x 15
+y 19
+end
+arch grass_only
+x 15
+y 20
+end
+arch cobblestones2
+x 16
+end
+arch cobblestones2
+x 16
+y 1
+end
+arch cobblestones2
+x 16
+y 2
+end
+arch cobblestones2
+x 16
+y 3
+end
+arch cobblestones2
+x 16
+y 4
+end
+arch cobblestones2
+x 16
+y 5
+end
+arch cobblestones2
+x 16
+y 6
+end
+arch cobblestones2
+x 16
+y 7
+end
+arch cobblestones2
+x 16
+y 8
+end
+arch cobblestones2
+x 16
+y 9
+end
+arch cobblestones2
+x 16
+y 10
+end
+arch cobblestones2
+x 16
+y 11
+end
+arch cobblestones2
+x 16
+y 12
+end
+arch cobblestones2
+x 16
+y 13
+end
+arch cobblestones2
+x 16
+y 14
+end
+arch cobblestones2
+x 16
+y 15
+end
+arch cobblestones2
+x 16
+y 16
+end
+arch cobblestones2
+x 16
+y 17
+end
+arch cobblestones2
+x 16
+y 18
+end
+arch cobblestones2
+x 16
+y 19
+end
+arch cobblestones2
+x 16
+y 20
+end
diff --git a/world/world_121_117 b/world/world_121_117
index ced674939..a4d5b75d6 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-14 Rick Tanner
+Modified: 2012-07-15 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_121_116
@@ -12577,8 +12577,8 @@ end
 arch bungalow
 name Charlie's Place
 slaying ../navar_city/houses/charliesplace
-hp 12
-sp 5
+hp 3
+sp 10
 x 44
 y 11
 end