diff --git a/inn_and_outpost/README b/inn_and_outpost/README
index ce15bae67..ff248ebda 100644
--- a/inn_and_outpost/README
+++ b/inn_and_outpost/README
@@ -8,5 +8,6 @@ It would be good to put the map location of the buildings in this file and to tr
 *It would be cool to develop a standard notation for this sort of thing
 
 name		maps			parent map	xpos	ypos
-*******************************************************************		
-Hermes' Inn	hermes_inn,hermes_inn2	world_111_116 	x45 	y34
\ No newline at end of file
+**********************************************************************		
+Hermes' Inn	hermes_inn,hermes_inn2	world_111_116 	x45 	y34
+Grumm's Inn	grumms_inn,grumms_inn2	world_120_109	x42	y43
\ No newline at end of file
diff --git a/inn_and_outpost/grumms_inn b/inn_and_outpost/grumms_inn
new file mode 100755
index 000000000..68ac0268e
--- /dev/null
+++ b/inn_and_outpost/grumms_inn
@@ -0,0 +1,2263 @@
+arch map
+name Grumm's Inn
+msg
+Grumm's Inn
+Creator: Todd Mitchell
+CF Java Map Editor
+Date:    10/27/2002
+endmsg
+width 25
+height 15
+enter_x 7
+enter_y 13
+outdoor 1
+end
+arch woodfloor2
+end
+arch woodwall_2_2_2
+end
+arch woodfloor2
+y 1
+end
+arch woodwall_2_1_1
+y 1
+end
+arch woodfloor2
+y 2
+end
+arch woodwall_2_1_1
+y 2
+end
+arch woodfloor2
+y 3
+end
+arch woodwall_2_1_1
+y 3
+end
+arch woodfloor2
+y 4
+end
+arch woodwall_2_1_1
+y 4
+end
+arch woodfloor2
+y 5
+end
+arch woodwall_2_1_1
+y 5
+end
+arch woodfloor2
+y 6
+end
+arch woodwall_2_1_1
+y 6
+end
+arch woodfloor2
+y 7
+end
+arch woodwall_2_1_1
+y 7
+end
+arch woodfloor2
+y 8
+end
+arch woodwall_2_1_1
+y 8
+end
+arch woodfloor2
+y 9
+end
+arch woodwall_2_2_1
+y 9
+end
+arch grass
+y 10
+end
+arch invis_exit
+slaying /world/world_120_109
+hp 42
+sp 43
+y 10
+end
+arch grass
+y 11
+end
+arch invis_exit
+slaying /world/world_120_109
+hp 42
+sp 43
+y 11
+end
+arch grass
+y 12
+end
+arch invis_exit
+slaying /world/world_120_109
+hp 42
+sp 43
+y 12
+end
+arch grass
+y 13
+end
+arch invis_exit
+slaying /world/world_120_109
+hp 42
+sp 43
+y 13
+end
+arch grass
+y 14
+end
+arch invis_exit
+slaying /world/world_120_109
+hp 42
+sp 43
+y 14
+end
+arch woodfloor2
+x 1
+end
+arch woodwall_2_1_2
+x 1
+end
+arch woodfloor2
+x 1
+y 1
+end
+arch barrel
+x 1
+y 1
+end
+arch woodfloor2
+x 1
+y 2
+end
+arch brazier
+x 1
+y 2
+end
+arch light4
+x 1
+y 2
+end
+arch woodfloor2
+x 1
+y 3
+end
+arch woodfloor2
+x 1
+y 4
+end
+arch woodfloor2
+x 1
+y 5
+end
+arch woodfloor2
+x 1
+y 6
+end
+arch woodfloor2
+x 1
+y 7
+end
+arch brazier
+x 1
+y 7
+end
+arch light4
+x 1
+y 7
+end
+arch woodfloor2
+x 1
+y 8
+end
+arch barrel
+x 1
+y 8
+end
+arch woodfloor2
+x 1
+y 9
+end
+arch woodwall_2_1_2
+x 1
+y 9
+end
+arch grass
+x 1
+y 10
+end
+arch grass
+x 1
+y 11
+end
+arch evergreen
+x 1
+y 12
+end
+arch grass
+x 1
+y 13
+end
+arch grass
+x 1
+y 14
+end
+arch invis_exit
+slaying /world/world_120_109
+hp 42
+sp 43
+x 1
+y 14
+end
+arch woodfloor2
+x 2
+end
+arch woodwall_2_1_2
+x 2
+end
+arch woodfloor2
+x 2
+y 1
+end
+arch barrel
+x 2
+y 1
+end
+arch woodfloor2
+x 2
+y 2
+end
+arch longtable_1_4
+no_pass 1
+x 2
+y 2
+end
+arch woodfloor2
+x 2
+y 3
+end
+arch identify_table
+name Drop 25 gold to identify an item.
+food 250
+x 2
+y 3
+end
+arch woodfloor2
+x 2
+y 4
+end
+arch woodfloor2
+x 2
+y 5
+end
+arch woodfloor2
+x 2
+y 6
+end
+arch woodfloor2
+x 2
+y 7
+end
+arch woodfloor2
+x 2
+y 8
+end
+arch woodfloor2
+x 2
+y 9
+end
+arch woodwall_2_1_2
+x 2
+y 9
+end
+arch grass
+x 2
+y 10
+end
+arch evergreen
+x 2
+y 11
+end
+arch grass
+x 2
+y 12
+end
+arch grass
+x 2
+y 13
+end
+arch grass
+x 2
+y 14
+end
+arch invis_exit
+slaying /world/world_120_109
+hp 42
+sp 43
+x 2
+y 14
+end
+arch woodfloor2
+x 3
+end
+arch woodwall_2_1_2
+x 3
+end
+arch woodfloor2
+x 3
+y 1
+end
+arch dwarf_priest
+name Ingo
+msg
+@match *
+I would be happy to assist you.
+You will find my prices quite reasonable.
+endmsg
+unaggressive 0
+friendly 1
+stand_still 1
+x 3
+y 1
+end
+arch woodfloor2
+x 3
+y 2
+end
+arch longtable_2_1_2
+no_pass 1
+x 3
+y 2
+end
+arch woodfloor2
+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 chair_1.4
+x 3
+y 6
+end
+arch woodfloor2
+x 3
+y 7
+end
+arch woodfloor2
+x 3
+y 8
+end
+arch chair_1.4
+x 3
+y 8
+end
+arch woodfloor2
+x 3
+y 9
+end
+arch woodwall_2_1_2
+x 3
+y 9
+end
+arch grass
+x 3
+y 10
+end
+arch grass
+x 3
+y 11
+end
+arch grass
+x 3
+y 12
+end
+arch grass
+x 3
+y 13
+end
+arch grass
+x 3
+y 14
+end
+arch invis_exit
+slaying /world/world_120_109
+hp 42
+sp 43
+x 3
+y 14
+end
+arch woodfloor2
+x 4
+end
+arch woodwall_2_1_2
+x 4
+end
+arch woodfloor2
+x 4
+y 1
+end
+arch woodfloor2
+x 4
+y 2
+end
+arch longtable_2_1_2
+no_pass 1
+x 4
+y 2
+end
+arch woodfloor2
+x 4
+y 3
+end
+arch woodfloor2
+x 4
+y 4
+end
+arch woodfloor2
+name woodfloor
+x 4
+y 5
+end
+arch chair_1.1
+x 4
+y 5
+end
+arch fighter
+name Samar
+msg
+@match hi|hello
+Good day for it eh?
+@match it?
+Kicking up and having a pint.
+@match dwarves|mine
+Ya, I hired on to guard the mine.
+Good work if you get along with dwarves.
+endmsg
+title the quick
+level 6
+unaggressive 0
+friendly 1
+x 4
+y 5
+end
+arch woodfloor2
+x 4
+y 6
+end
+arch table_3
+x 4
+y 6
+end
+arch woodfloor2
+x 4
+y 7
+end
+arch woodfloor2
+x 4
+y 8
+end
+arch table_3
+x 4
+y 8
+end
+arch woodfloor2
+x 4
+y 9
+end
+arch woodwall_2_1_2
+x 4
+y 9
+end
+arch grass
+x 4
+y 10
+end
+arch grass
+x 4
+y 11
+end
+arch grass
+x 4
+y 12
+end
+arch grass
+x 4
+y 13
+end
+arch grass
+x 4
+y 14
+end
+arch invis_exit
+slaying /world/world_120_109
+hp 42
+sp 43
+x 4
+y 14
+end
+arch woodfloor2
+x 5
+end
+arch woodwall_2_1_2
+x 5
+end
+arch woodfloor2
+x 5
+y 1
+end
+arch woodfloor2
+x 5
+y 2
+end
+arch longtable_2_1_2
+no_pass 1
+x 5
+y 2
+end
+arch woodfloor2
+x 5
+y 3
+end
+arch gold_converter
+name convert gold into platinum (6:1)
+food 6
+x 5
+y 3
+end
+arch woodfloor2
+x 5
+y 4
+end
+arch woodfloor2
+name woodfloor
+x 5
+y 5
+end
+arch woodfloor2
+x 5
+y 5
+end
+arch woodfloor2
+x 5
+y 6
+end
+arch chair_1.2
+x 5
+y 6
+end
+arch woodfloor2
+x 5
+y 7
+end
+arch woodfloor2
+x 5
+y 8
+end
+arch chair_1.2
+x 5
+y 8
+end
+arch woodfloor2
+x 5
+y 9
+end
+arch woodwall_2_1_2
+x 5
+y 9
+end
+arch grass
+x 5
+y 10
+end
+arch brazier
+x 5
+y 10
+end
+arch light4
+x 5
+y 10
+end
+arch grass
+x 5
+y 11
+end
+arch grass
+x 5
+y 12
+end
+arch grass
+x 5
+y 13
+end
+arch grass
+x 5
+y 14
+end
+arch invis_exit
+slaying /world/world_120_109
+hp 42
+sp 43
+x 5
+y 14
+end
+arch woodfloor2
+x 6
+end
+arch woodwall_2_1_2
+x 6
+end
+arch woodfloor2
+x 6
+y 1
+end
+arch woodfloor2
+x 6
+y 2
+end
+arch longtable_1_3
+no_pass 1
+x 6
+y 2
+end
+arch woodfloor2
+x 6
+y 3
+end
+arch silver_converter
+name convert silver into gold (13:1)
+food 11
+x 6
+y 3
+end
+arch woodfloor2
+x 6
+y 4
+end
+arch woodfloor2
+name woodfloor
+x 6
+y 5
+end
+arch woodfloor2
+name woodfloor
+x 6
+y 6
+end
+arch woodfloor2
+name woodfloor
+x 6
+y 7
+end
+arch woodfloor2
+name woodfloor
+x 6
+y 8
+end
+arch woodfloor2
+x 6
+y 9
+end
+arch woodwall_1_3
+x 6
+y 9
+end
+arch small_stones
+x 6
+y 10
+end
+arch small_stones
+x 6
+y 11
+end
+arch small_stones
+x 6
+y 12
+end
+arch small_stones
+x 6
+y 13
+end
+arch grass
+x 6
+y 14
+end
+arch invis_exit
+slaying /world/world_120_109
+hp 42
+sp 43
+x 6
+y 14
+end
+arch woodfloor2
+x 7
+end
+arch woodwall_2_1_2
+x 7
+end
+arch woodfloor2
+x 7
+y 1
+end
+arch woodfloor2
+x 7
+y 2
+end
+arch brazier
+x 7
+y 2
+end
+arch light4
+x 7
+y 2
+end
+arch woodfloor2
+x 7
+y 3
+end
+arch woodfloor2
+x 7
+y 4
+end
+arch woodfloor2
+x 7
+y 4
+end
+arch woodfloor2
+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 button_small
+invisible 1
+connected 1
+x 7
+y 8
+end
+arch woodfloor2
+x 7
+y 9
+end
+arch mdoor_closed_1
+connected 1
+x 7
+y 9
+end
+arch small_stones
+x 7
+y 10
+end
+arch button_small
+invisible 1
+connected 1
+x 7
+y 10
+end
+arch small_stones
+x 7
+y 11
+end
+arch small_stones
+x 7
+y 12
+end
+arch small_stones
+x 7
+y 13
+end
+arch grass
+x 7
+y 14
+end
+arch invis_exit
+slaying /world/world_120_109
+hp 42
+sp 43
+x 7
+y 14
+end
+arch woodfloor2
+x 8
+end
+arch woodwall_2_1_2
+x 8
+end
+arch woodfloor2
+x 8
+y 1
+end
+arch woodfloor2
+x 8
+y 2
+end
+arch longtable_1_1
+no_pass 1
+x 8
+y 2
+end
+arch woodfloor2
+x 8
+y 3
+end
+arch longtable_2_2_1
+no_pass 1
+x 8
+y 3
+end
+arch woodfloor2
+x 8
+y 4
+end
+arch woodfloor2
+x 8
+y 5
+end
+arch woodfloor2
+x 8
+y 6
+end
+arch woodfloor2
+x 8
+y 7
+end
+arch brazier
+x 8
+y 7
+end
+arch light4
+x 8
+y 7
+end
+arch woodfloor2
+x 8
+y 8
+end
+arch woodfloor2
+x 8
+y 9
+end
+arch woodwall_1_4
+x 8
+y 9
+end
+arch small_stones
+x 8
+y 10
+end
+arch small_stones
+x 8
+y 11
+end
+arch small_stones
+x 8
+y 12
+end
+arch small_stones
+x 8
+y 13
+end
+arch grass
+x 8
+y 14
+end
+arch invis_exit
+slaying /world/world_120_109
+hp 42
+sp 43
+x 8
+y 14
+end
+arch woodfloor2
+x 9
+end
+arch woodwall_2_1_2
+x 9
+end
+arch woodfloor2
+x 9
+y 1
+end
+arch woodfloor2
+x 9
+y 2
+end
+arch barrel
+x 9
+y 2
+end
+arch woodfloor2
+x 9
+y 3
+end
+arch longtable_2_1_2
+no_pass 1
+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 woodfloor2
+x 9
+y 7
+end
+arch chair_1.1
+x 9
+y 7
+end
+arch woodfloor2
+x 9
+y 8
+end
+arch table_3
+x 9
+y 8
+end
+arch woodfloor2
+x 9
+y 9
+end
+arch woodwall_2_1_2
+x 9
+y 9
+end
+arch grass
+x 9
+y 10
+end
+arch brazier
+x 9
+y 10
+end
+arch light4
+x 9
+y 10
+end
+arch grass
+x 9
+y 11
+end
+arch grass
+x 9
+y 12
+end
+arch grass
+x 9
+y 13
+end
+arch grass
+x 9
+y 14
+end
+arch invis_exit
+slaying /world/world_120_109
+hp 42
+sp 43
+x 9
+y 14
+end
+arch woodfloor2
+x 10
+end
+arch woodwall_2_1_2
+x 10
+end
+arch woodfloor2
+x 10
+y 1
+end
+arch fireplace
+x 10
+y 1
+end
+arch light2
+x 10
+y 1
+end
+arch woodfloor2
+x 10
+y 2
+end
+arch woodfloor2
+x 10
+y 3
+end
+arch longtable_2_1_2
+no_pass 1
+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 chair_1.4
+x 10
+y 6
+end
+arch woodfloor2
+x 10
+y 7
+end
+arch woodfloor2
+x 10
+y 8
+end
+arch chair_1.2
+x 10
+y 8
+end
+arch woodfloor2
+x 10
+y 9
+end
+arch woodwall_2_1_2
+x 10
+y 9
+end
+arch grass
+x 10
+y 10
+end
+arch swall_2_2_2
+x 10
+y 10
+end
+arch grass
+x 10
+y 11
+end
+arch swall_1_2
+x 10
+y 11
+end
+arch grass
+x 10
+y 12
+end
+arch grass
+x 10
+y 13
+end
+arch swall_1_1
+x 10
+y 13
+end
+arch grass
+x 10
+y 14
+end
+arch swall_2_2_1
+x 10
+y 14
+end
+arch woodfloor2
+x 11
+end
+arch woodwall_2_1_2
+x 11
+end
+arch woodfloor2
+x 11
+y 1
+end
+arch fireplace
+x 11
+y 1
+end
+arch light2
+x 11
+y 1
+end
+arch woodfloor2
+x 11
+y 2
+end
+arch dwarf_wiz
+name Grumm
+msg
+@match chicken|garden
+Damn priest!
+His chickens are always in my garden!
+@match priest
+Veratin, the priest of Gaia
+@match *
+Greetings and welcome to my inn.
+Rooms are available upstairs for a modest price.
+Please remember if you leave you will
+have to pay again.
+endmsg
+unaggressive 0
+friendly 1
+stand_still 1
+x 11
+y 2
+end
+arch woodfloor2
+x 11
+y 3
+end
+arch longtable_2_1_2
+no_pass 1
+x 11
+y 3
+end
+arch woodfloor2
+x 11
+y 4
+end
+arch woodfloor2
+x 11
+y 5
+end
+arch chair_1.1
+x 11
+y 5
+end
+arch woodfloor2
+x 11
+y 6
+end
+arch table_3
+x 11
+y 6
+end
+arch woodfloor2
+x 11
+y 7
+end
+arch woodfloor2
+x 11
+y 8
+end
+arch woodfloor2
+x 11
+y 9
+end
+arch woodwall_2_1_2
+x 11
+y 9
+end
+arch grass
+x 11
+y 10
+end
+arch swall_2_1_2
+x 11
+y 10
+end
+arch farmland
+x 11
+y 11
+end
+arch farmland
+x 11
+y 12
+end
+arch farmland
+x 11
+y 13
+end
+arch grass
+x 11
+y 14
+end
+arch swall_2_1_2
+x 11
+y 14
+end
+arch woodfloor2
+x 12
+end
+arch woodwall_2_1_2
+x 12
+end
+arch woodfloor2
+x 12
+y 1
+end
+arch woodfloor2
+x 12
+y 2
+end
+arch woodfloor2
+x 12
+y 3
+end
+arch longtable_2_1_2
+no_pass 1
+x 12
+y 3
+end
+arch woodfloor2
+x 12
+y 4
+end
+arch woodfloor2
+x 12
+y 5
+end
+arch woodfloor2
+x 12
+y 5
+end
+arch woodfloor2
+x 12
+y 6
+end
+arch chair_1.2
+x 12
+y 6
+end
+arch woodfloor2
+x 12
+y 7
+end
+arch woodfloor2
+x 12
+y 8
+end
+arch chair_1.4
+x 12
+y 8
+end
+arch greater_dwarven_guard
+name Rudyard
+msg
+@match hello|hi
+Good day!
+@match Harlon|harlon
+He's mad because he lost his pay
+in a game of Orcfingers.
+endmsg
+exp 20
+friendly 1
+stand_still 1
+x 12
+y 8
+end
+arch woodfloor2
+x 12
+y 9
+end
+arch woodwall_2_1_2
+x 12
+y 9
+end
+arch grass
+x 12
+y 10
+end
+arch swall_2_1_2
+x 12
+y 10
+end
+arch farmland
+x 12
+y 11
+end
+arch farmland
+x 12
+y 12
+end
+arch farmland
+x 12
+y 13
+end
+arch chicken
+x 12
+y 13
+end
+arch grass
+x 12
+y 14
+end
+arch swall_2_1_2
+x 12
+y 14
+end
+arch woodfloor2
+x 13
+end
+arch woodwall_2_1_2
+x 13
+end
+arch woodfloor2
+x 13
+y 1
+end
+arch woodfloor2
+x 13
+y 2
+end
+arch longtable_1_1
+no_pass 1
+x 13
+y 2
+end
+arch woodfloor2
+x 13
+y 3
+end
+arch longtable_2_2_4
+no_pass 1
+x 13
+y 3
+end
+arch woodfloor2
+x 13
+y 4
+end
+arch woodfloor2
+x 13
+y 5
+end
+arch woodfloor2
+x 13
+y 5
+end
+arch woodfloor2
+x 13
+y 6
+end
+arch woodfloor2
+x 13
+y 7
+end
+arch chair_1.1
+x 13
+y 7
+end
+arch greater_dwarven_guard
+name Harlon
+msg
+@match *
+Bah!
+endmsg
+friendly 1
+stand_still 1
+x 13
+y 7
+end
+arch woodfloor2
+x 13
+y 8
+end
+arch table_3
+x 13
+y 8
+end
+arch woodfloor2
+x 13
+y 9
+end
+arch woodwall_2_1_2
+x 13
+y 9
+end
+arch grass
+x 13
+y 10
+end
+arch swall_2_1_2
+x 13
+y 10
+end
+arch farmland
+x 13
+y 11
+end
+arch farmland
+x 13
+y 12
+end
+arch farmland
+x 13
+y 13
+end
+arch grass
+x 13
+y 14
+end
+arch swall_2_1_2
+x 13
+y 14
+end
+arch woodfloor2
+x 14
+end
+arch woodwall_2_1_2
+x 14
+end
+arch woodfloor2
+x 14
+y 1
+end
+arch woodfloor2
+x 14
+y 2
+end
+arch brazier
+x 14
+y 2
+end
+arch light4
+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 woodfloor2
+x 14
+y 6
+end
+arch woodfloor2
+x 14
+y 7
+end
+arch brazier
+x 14
+y 7
+end
+arch light4
+x 14
+y 7
+end
+arch woodfloor2
+x 14
+y 8
+end
+arch woodfloor2
+x 14
+y 9
+end
+arch woodwall_2_1_2
+x 14
+y 9
+end
+arch grass
+x 14
+y 10
+end
+arch swall_2_1_2
+x 14
+y 10
+end
+arch farmland
+x 14
+y 11
+end
+arch chicken
+x 14
+y 11
+end
+arch farmland
+x 14
+y 12
+end
+arch farmland
+x 14
+y 13
+end
+arch grass
+x 14
+y 14
+end
+arch swall_2_1_2
+x 14
+y 14
+end
+arch woodfloor2
+x 15
+end
+arch woodwall_2_1_2
+x 15
+end
+arch woodfloor2
+x 15
+y 1
+end
+arch woodfloor2
+x 15
+y 2
+end
+arch longtable_1_4
+no_pass 1
+x 15
+y 2
+end
+arch woodfloor2
+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 chair_1.1
+x 15
+y 7
+end
+arch woodfloor2
+x 15
+y 8
+end
+arch table_3
+x 15
+y 8
+end
+arch woodfloor2
+x 15
+y 9
+end
+arch woodwall_2_1_2
+x 15
+y 9
+end
+arch grass
+x 15
+y 10
+end
+arch swall_2_1_2
+x 15
+y 10
+end
+arch farmland
+x 15
+y 11
+end
+arch farmland
+x 15
+y 12
+end
+arch farmland
+x 15
+y 13
+end
+arch grass
+x 15
+y 14
+end
+arch swall_2_1_2
+x 15
+y 14
+end
+arch woodfloor2
+x 16
+end
+arch woodwall_2_1_2
+x 16
+end
+arch woodfloor2
+x 16
+y 1
+end
+arch woodfloor2
+x 16
+y 2
+end
+arch longtable_2_1_2
+no_pass 1
+x 16
+y 2
+end
+arch woodfloor2
+x 16
+y 3
+end
+arch booze_table
+name Drop 6 gold for booze
+food 6
+x 16
+y 3
+end
+arch woodfloor2
+x 16
+y 4
+end
+arch woodfloor2
+name woodfloor
+x 16
+y 5
+end
+arch woodfloor2
+x 16
+y 6
+end
+arch chair_1.4
+x 16
+y 6
+end
+arch woodfloor2
+x 16
+y 7
+end
+arch woodfloor2
+x 16
+y 8
+end
+arch chair_1.2
+x 16
+y 8
+end
+arch woodfloor2
+x 16
+y 9
+end
+arch woodwall_2_1_2
+x 16
+y 9
+end
+arch grass
+x 16
+y 10
+end
+arch swall_2_1_2
+x 16
+y 10
+end
+arch farmland
+x 16
+y 11
+end
+arch farmland
+x 16
+y 12
+end
+arch farmland
+x 16
+y 13
+end
+arch grass
+x 16
+y 14
+end
+arch swall_2_1_2
+x 16
+y 14
+end
+arch woodfloor2
+x 17
+end
+arch woodwall_2_1_2
+x 17
+end
+arch woodfloor2
+x 17
+y 1
+end
+arch woodfloor2
+x 17
+y 2
+end
+arch longtable_2_1_2
+no_pass 1
+x 17
+y 2
+end
+arch woodfloor2
+x 17
+y 3
+end
+arch woodfloor2
+x 17
+y 4
+end
+arch woodfloor2
+name woodfloor
+x 17
+y 5
+end
+arch chair_1.1
+x 17
+y 5
+end
+arch woodfloor2
+x 17
+y 6
+end
+arch table_3
+x 17
+y 6
+end
+arch woodfloor2
+x 17
+y 7
+end
+arch woodfloor2
+x 17
+y 8
+end
+arch woodfloor2
+x 17
+y 9
+end
+arch woodwall_2_1_2
+x 17
+y 9
+end
+arch grass
+x 17
+y 10
+end
+arch swall_2_1_2
+x 17
+y 10
+end
+arch farmland
+x 17
+y 11
+end
+arch farmland
+x 17
+y 12
+end
+arch farmland
+x 17
+y 13
+end
+arch grass
+x 17
+y 14
+end
+arch swall_2_1_2
+x 17
+y 14
+end
+arch woodfloor2
+x 18
+end
+arch woodwall_2_1_2
+x 18
+end
+arch woodfloor2
+x 18
+y 1
+end
+arch woodfloor2
+x 18
+y 2
+end
+arch longtable_1_3
+face longtable_A.111
+no_pass 1
+x 18
+y 2
+end
+arch woodfloor2
+x 18
+y 3
+end
+arch food_table
+name Drop 10 gold for food
+food 10
+x 18
+y 3
+end
+arch woodfloor2
+x 18
+y 4
+end
+arch woodfloor2
+x 18
+y 5
+end
+arch woodfloor2
+x 18
+y 6
+end
+arch chair_1.2
+x 18
+y 6
+end
+arch woodfloor2
+x 18
+y 7
+end
+arch woodfloor2
+x 18
+y 8
+end
+arch chair_1.4
+x 18
+y 8
+end
+arch woodfloor2
+x 18
+y 9
+end
+arch woodwall_2_1_2
+x 18
+y 9
+end
+arch grass
+x 18
+y 10
+end
+arch swall_2_1_2
+x 18
+y 10
+end
+arch farmland
+x 18
+y 11
+end
+arch farmland
+x 18
+y 12
+end
+arch farmland
+x 18
+y 13
+end
+arch grass
+x 18
+y 14
+end
+arch swall_2_1_2
+x 18
+y 14
+end
+arch woodfloor2
+x 19
+end
+arch woodwall_2_1_2
+x 19
+end
+arch woodfloor2
+x 19
+y 1
+end
+arch woodfloor2
+x 19
+y 2
+end
+arch longtable_1_3
+no_pass 1
+x 19
+y 2
+end
+arch woodfloor2
+x 19
+y 3
+end
+arch woodfloor2
+x 19
+y 4
+end
+arch woodfloor2
+x 19
+y 5
+end
+arch woodfloor2
+x 19
+y 6
+end
+arch woodfloor2
+x 19
+y 7
+end
+arch chair_1.1
+x 19
+y 7
+end
+arch woodfloor2
+x 19
+y 8
+end
+arch table_3
+x 19
+y 8
+end
+arch woodfloor2
+x 19
+y 9
+end
+arch woodwall_2_1_2
+x 19
+y 9
+end
+arch grass
+x 19
+y 10
+end
+arch swall_2_1_2
+x 19
+y 10
+end
+arch farmland
+x 19
+y 11
+end
+arch farmland
+x 19
+y 12
+end
+arch farmland
+x 19
+y 13
+end
+arch grass
+x 19
+y 14
+end
+arch swall_2_1_2
+x 19
+y 14
+end
+arch woodfloor2
+x 20
+end
+arch woodwall_2_1_2
+x 20
+end
+arch woodfloor2
+x 20
+y 1
+end
+arch woodfloor2
+x 20
+y 2
+end
+arch brazier
+x 20
+y 2
+end
+arch light4
+x 20
+y 2
+end
+arch woodfloor2
+x 20
+y 3
+end
+arch stair_up_2
+slaying grumms_inn2
+hp 20
+sp 3
+x 20
+y 3
+end
+arch woodfloor2
+x 20
+y 4
+end
+arch altar
+name drop 50 gold for a room
+type 31
+slaying goldcoin
+food 50
+connected 1
+last_sp 1
+x 20
+y 4
+end
+arch teleporter
+invisible 1
+slaying grumms_inn2
+hp 20
+sp 3
+connected 1
+speed 0.0
+x 20
+y 4
+end
+arch woodfloor2
+x 20
+y 5
+end
+arch woodfloor2
+x 20
+y 6
+end
+arch woodfloor2
+x 20
+y 7
+end
+arch brazier
+x 20
+y 7
+end
+arch light4
+x 20
+y 7
+end
+arch woodfloor2
+x 20
+y 8
+end
+arch woodfloor2
+x 20
+y 9
+end
+arch woodwall_2_1_2
+x 20
+y 9
+end
+arch grass
+x 20
+y 10
+end
+arch swall_2_1_2
+x 20
+y 10
+end
+arch farmland
+x 20
+y 11
+end
+arch farmland
+x 20
+y 12
+end
+arch farmland
+x 20
+y 13
+end
+arch grass
+x 20
+y 14
+end
+arch swall_2_1_2
+x 20
+y 14
+end
+arch woodfloor2
+x 21
+end
+arch woodwall_2_2_3
+x 21
+end
+arch woodfloor2
+x 21
+y 1
+end
+arch woodwall_2_1_1
+x 21
+y 1
+end
+arch woodfloor2
+x 21
+y 2
+end
+arch woodwall_2_1_1
+x 21
+y 2
+end
+arch woodfloor2
+x 21
+y 3
+end
+arch woodwall_2_1_1
+x 21
+y 3
+end
+arch woodfloor2
+x 21
+y 4
+end
+arch woodwall_2_1_1
+x 21
+y 4
+end
+arch woodfloor2
+x 21
+y 5
+end
+arch woodwall_2_1_1
+x 21
+y 5
+end
+arch woodfloor2
+x 21
+y 6
+end
+arch woodwall_2_1_1
+x 21
+y 6
+end
+arch woodfloor2
+x 21
+y 7
+end
+arch woodwall_2_1_1
+x 21
+y 7
+end
+arch woodfloor2
+x 21
+y 8
+end
+arch woodwall_2_1_1
+x 21
+y 8
+end
+arch woodfloor2
+x 21
+y 9
+end
+arch woodwall_2_2_4
+x 21
+y 9
+end
+arch grass
+x 21
+y 10
+end
+arch swall_2_2_3
+x 21
+y 10
+end
+arch grass
+x 21
+y 11
+end
+arch swall_2_1_1
+x 21
+y 11
+end
+arch grass
+x 21
+y 12
+end
+arch swall_2_1_1
+x 21
+y 12
+end
+arch grass
+x 21
+y 13
+end
+arch swall_2_1_1
+x 21
+y 13
+end
+arch grass
+x 21
+y 14
+end
+arch swall_2_2_4
+x 21
+y 14
+end
+arch blocked
+x 22
+end
+arch blocked
+x 22
+y 1
+end
+arch blocked
+x 22
+y 2
+end
+arch blocked
+x 22
+y 3
+end
+arch blocked
+x 22
+y 4
+end
+arch blocked
+x 22
+y 5
+end
+arch blocked
+x 22
+y 6
+end
+arch blocked
+x 22
+y 7
+end
+arch blocked
+x 22
+y 8
+end
+arch blocked
+x 22
+y 9
+end
+arch blocked
+x 22
+y 10
+end
+arch blocked
+x 22
+y 11
+end
+arch blocked
+x 22
+y 12
+end
+arch blocked
+x 22
+y 13
+end
+arch blocked
+x 22
+y 14
+end
diff --git a/inn_and_outpost/grumms_inn2 b/inn_and_outpost/grumms_inn2
new file mode 100755
index 000000000..ba28ad865
--- /dev/null
+++ b/inn_and_outpost/grumms_inn2
@@ -0,0 +1,1493 @@
+arch map
+name Grumms Inn Upstairs
+msg
+Grumm's Inn
+Creator: Todd Mitchell
+CF Java Map Editor
+Date:    10/27/2002
+endmsg
+width 22
+height 10
+enter_x 20
+enter_y 3
+outdoor 1
+end
+arch woodfloor2
+end
+arch woodwall_2_2_2
+end
+arch woodfloor2
+y 1
+end
+arch woodwall_2_1_1
+y 1
+end
+arch woodfloor2
+y 2
+end
+arch woodwall_2_1_1
+y 2
+end
+arch woodfloor2
+y 3
+end
+arch woodwall_3_2
+y 3
+end
+arch woodfloor2
+y 4
+end
+arch woodwall_2_1_1
+y 4
+end
+arch woodfloor2
+y 5
+end
+arch woodwall_2_1_1
+y 5
+end
+arch woodfloor2
+y 6
+end
+arch woodwall_3_2
+y 6
+end
+arch woodfloor2
+y 7
+end
+arch woodwall_2_1_1
+y 7
+end
+arch woodfloor2
+y 8
+end
+arch woodwall_2_1_1
+y 8
+end
+arch woodfloor2
+y 9
+end
+arch woodwall_2_2_1
+y 9
+end
+arch woodfloor2
+x 1
+end
+arch woodwall_2_1_2
+x 1
+end
+arch woodfloor2
+x 1
+y 1
+end
+arch bed_save
+x 1
+y 1
+end
+arch woodfloor2
+x 1
+y 2
+end
+arch woodfloor2
+x 1
+y 3
+end
+arch woodwall_1_3
+x 1
+y 3
+end
+arch woodfloor2
+x 1
+y 4
+end
+arch brazier
+x 1
+y 4
+end
+arch light3
+x 1
+y 4
+end
+arch woodfloor2
+x 1
+y 5
+end
+arch brazier
+x 1
+y 5
+end
+arch light3
+x 1
+y 5
+end
+arch woodfloor2
+x 1
+y 6
+end
+arch woodwall_1_3
+x 1
+y 6
+end
+arch woodfloor2
+x 1
+y 7
+end
+arch woodfloor2
+x 1
+y 8
+end
+arch bed_save
+x 1
+y 8
+end
+arch woodfloor2
+x 1
+y 9
+end
+arch woodwall_2_1_2
+x 1
+y 9
+end
+arch woodfloor2
+x 2
+end
+arch woodwall_2_1_2
+x 2
+end
+arch woodfloor2
+x 2
+y 1
+end
+arch woodfloor2
+x 2
+y 2
+end
+arch button_small
+invisible 1
+connected 1
+x 2
+y 2
+end
+arch woodfloor2
+x 2
+y 3
+end
+arch mdoor_closed_1
+connected 1
+x 2
+y 3
+end
+arch woodfloor2
+x 2
+y 4
+end
+arch button_small
+invisible 1
+connected 1
+x 2
+y 4
+end
+arch woodfloor2
+x 2
+y 5
+end
+arch button_small
+invisible 1
+connected 2
+x 2
+y 5
+end
+arch woodfloor2
+x 2
+y 6
+end
+arch mdoor_closed_1
+connected 2
+x 2
+y 6
+end
+arch woodfloor2
+x 2
+y 7
+end
+arch button_small
+invisible 1
+connected 2
+x 2
+y 7
+end
+arch woodfloor2
+x 2
+y 8
+end
+arch woodfloor2
+x 2
+y 9
+end
+arch woodwall_2_1_2
+x 2
+y 9
+end
+arch woodfloor2
+x 3
+end
+arch woodwall_2_1_2
+x 3
+end
+arch woodfloor2
+x 3
+y 1
+end
+arch table
+x 3
+y 1
+end
+arch woodfloor2
+x 3
+y 2
+end
+arch woodfloor2
+x 3
+y 3
+end
+arch woodwall_1_4
+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 woodwall_1_4
+x 3
+y 6
+end
+arch woodfloor2
+x 3
+y 7
+end
+arch woodfloor2
+x 3
+y 8
+end
+arch table
+x 3
+y 8
+end
+arch woodfloor2
+x 3
+y 9
+end
+arch woodwall_2_1_2
+x 3
+y 9
+end
+arch woodfloor2
+x 4
+end
+arch woodwall_2_1_2
+x 4
+end
+arch woodfloor2
+x 4
+y 1
+end
+arch chair_1.2
+x 4
+y 1
+end
+arch woodfloor2
+x 4
+y 2
+end
+arch bed_save
+x 4
+y 2
+end
+arch woodfloor2
+x 4
+y 3
+end
+arch woodwall_2_1_2
+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 woodwall_2_1_2
+x 4
+y 6
+end
+arch woodfloor2
+x 4
+y 7
+end
+arch bed_save
+x 4
+y 7
+end
+arch woodfloor2
+x 4
+y 8
+end
+arch chair_1.2
+x 4
+y 8
+end
+arch woodfloor2
+x 4
+y 9
+end
+arch woodwall_2_1_2
+x 4
+y 9
+end
+arch woodfloor2
+x 5
+end
+arch woodwall_3_3
+x 5
+end
+arch woodfloor2
+x 5
+y 1
+end
+arch woodwall_2_1_1
+x 5
+y 1
+end
+arch woodfloor2
+x 5
+y 2
+end
+arch woodwall_2_1_1
+x 5
+y 2
+end
+arch woodfloor2
+x 5
+y 3
+end
+arch woodwall_2_2_4
+x 5
+y 3
+end
+arch woodfloor2
+x 5
+y 4
+end
+arch woodfloor2
+x 5
+y 5
+end
+arch woodfloor2
+x 5
+y 6
+end
+arch woodwall_2_2_3
+x 5
+y 6
+end
+arch woodfloor2
+x 5
+y 7
+end
+arch woodwall_2_1_1
+x 5
+y 7
+end
+arch woodfloor2
+x 5
+y 8
+end
+arch woodwall_2_1_1
+x 5
+y 8
+end
+arch woodfloor2
+x 5
+y 9
+end
+arch woodwall_3_1
+x 5
+y 9
+end
+arch woodfloor2
+x 6
+end
+arch woodwall_2_1_2
+x 6
+end
+arch woodfloor2
+x 6
+y 1
+end
+arch barrel
+x 6
+y 1
+end
+arch woodfloor2
+x 6
+y 2
+end
+arch chair_1.2
+x 6
+y 2
+end
+arch woodfloor2
+x 6
+y 3
+end
+arch brazier
+x 6
+y 3
+end
+arch light3
+x 6
+y 3
+end
+arch woodfloor2
+x 6
+y 4
+end
+arch woodfloor2
+x 6
+y 5
+end
+arch woodfloor2
+x 6
+y 6
+end
+arch brazier
+x 6
+y 6
+end
+arch light3
+x 6
+y 6
+end
+arch woodfloor2
+x 6
+y 7
+end
+arch barrel
+x 6
+y 7
+end
+arch woodfloor2
+x 6
+y 8
+end
+arch barrel
+x 6
+y 8
+end
+arch woodfloor2
+x 6
+y 9
+end
+arch woodwall_2_1_2
+x 6
+y 9
+end
+arch woodfloor2
+x 7
+end
+arch woodwall_2_1_2
+x 7
+end
+arch woodfloor2
+x 7
+y 1
+end
+arch chair_1.1
+x 7
+y 1
+end
+arch woodfloor2
+x 7
+y 2
+end
+arch chair_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 woodfloor2
+x 7
+y 6
+end
+arch woodfloor2
+x 7
+y 7
+end
+arch woodfloor2
+x 7
+y 8
+end
+arch barrel
+x 7
+y 8
+end
+arch woodfloor2
+x 7
+y 9
+end
+arch woodwall_2_1_2
+x 7
+y 9
+end
+arch woodfloor2
+x 8
+end
+arch woodwall_3_3
+x 8
+end
+arch woodfloor2
+x 8
+y 1
+end
+arch woodwall_2_1_1
+x 8
+y 1
+end
+arch woodfloor2
+x 8
+y 2
+end
+arch woodwall_2_1_1
+x 8
+y 2
+end
+arch woodfloor2
+x 8
+y 3
+end
+arch woodwall_2_2_1
+x 8
+y 3
+end
+arch woodfloor2
+x 8
+y 4
+end
+arch woodfloor2
+x 8
+y 5
+end
+arch woodfloor2
+x 8
+y 6
+end
+arch woodwall_2_2_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_3_1
+x 8
+y 9
+end
+arch woodfloor2
+x 9
+end
+arch woodwall_2_1_2
+x 9
+end
+arch woodfloor2
+x 9
+y 1
+end
+arch bed_save
+x 9
+y 1
+end
+arch woodfloor2
+x 9
+y 2
+end
+arch chair_1.4
+x 9
+y 2
+end
+arch woodfloor2
+x 9
+y 3
+end
+arch woodwall_1_3
+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 bed_save
+x 9
+y 8
+end
+arch woodfloor2
+x 9
+y 9
+end
+arch woodwall_2_1_2
+x 9
+y 9
+end
+arch woodfloor2
+x 10
+end
+arch woodwall_2_1_2
+x 10
+end
+arch woodfloor2
+x 10
+y 1
+end
+arch woodfloor2
+x 10
+y 2
+end
+arch button_small
+invisible 1
+connected 3
+x 10
+y 2
+end
+arch woodfloor2
+x 10
+y 3
+end
+arch mdoor_closed_1
+connected 3
+x 10
+y 3
+end
+arch woodfloor2
+x 10
+y 4
+end
+arch button_small
+invisible 1
+connected 3
+x 10
+y 4
+end
+arch woodfloor2
+x 10
+y 5
+end
+arch button_small
+invisible 1
+connected 4
+x 10
+y 5
+end
+arch woodfloor2
+x 10
+y 6
+end
+arch mdoor_closed_1
+connected 4
+x 10
+y 6
+end
+arch woodfloor2
+x 10
+y 7
+end
+arch button_small
+invisible 1
+connected 6
+x 10
+y 7
+end
+arch woodfloor2
+x 10
+y 8
+end
+arch woodfloor2
+x 10
+y 9
+end
+arch woodwall_2_1_2
+x 10
+y 9
+end
+arch woodfloor2
+x 11
+end
+arch woodwall_2_1_2
+x 11
+end
+arch woodfloor2
+x 11
+y 1
+end
+arch woodfloor2
+x 11
+y 2
+end
+arch woodfloor2
+x 11
+y 3
+end
+arch woodwall_1_4
+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 woodwall_1_4
+x 11
+y 6
+end
+arch woodfloor2
+x 11
+y 7
+end
+arch woodfloor2
+x 11
+y 8
+end
+arch table
+x 11
+y 8
+end
+arch woodfloor2
+x 11
+y 9
+end
+arch woodwall_2_1_2
+x 11
+y 9
+end
+arch woodfloor2
+x 12
+end
+arch woodwall_2_1_2
+x 12
+end
+arch woodfloor2
+x 12
+y 1
+end
+arch woodfloor2
+x 12
+y 2
+end
+arch bed_save
+x 12
+y 2
+end
+arch woodfloor2
+x 12
+y 3
+end
+arch woodwall_2_1_2
+x 12
+y 3
+end
+arch woodfloor2
+x 12
+y 4
+end
+arch woodfloor2
+x 12
+y 5
+end
+arch woodfloor2
+x 12
+y 6
+end
+arch woodwall_2_1_2
+x 12
+y 6
+end
+arch woodfloor2
+x 12
+y 7
+end
+arch bed_save
+x 12
+y 7
+end
+arch woodfloor2
+x 12
+y 8
+end
+arch chair_1.2
+x 12
+y 8
+end
+arch woodfloor2
+x 12
+y 9
+end
+arch woodwall_2_1_2
+x 12
+y 9
+end
+arch woodfloor2
+x 13
+end
+arch woodwall_3_3
+x 13
+end
+arch woodfloor2
+x 13
+y 1
+end
+arch woodwall_2_1_1
+x 13
+y 1
+end
+arch woodfloor2
+x 13
+y 2
+end
+arch woodwall_2_1_1
+x 13
+y 2
+end
+arch woodfloor2
+x 13
+y 3
+end
+arch woodwall_2_2_4
+x 13
+y 3
+end
+arch woodfloor2
+x 13
+y 4
+end
+arch woodfloor2
+x 13
+y 5
+end
+arch woodfloor2
+x 13
+y 6
+end
+arch woodwall_2_2_3
+x 13
+y 6
+end
+arch woodfloor2
+x 13
+y 7
+end
+arch woodwall_2_1_1
+x 13
+y 7
+end
+arch woodfloor2
+x 13
+y 8
+end
+arch woodwall_2_1_1
+x 13
+y 8
+end
+arch woodfloor2
+x 13
+y 9
+end
+arch woodwall_3_1
+x 13
+y 9
+end
+arch woodfloor2
+x 14
+end
+arch woodwall_2_1_2
+x 14
+end
+arch woodfloor2
+x 14
+y 1
+end
+arch woodfloor2
+x 14
+y 2
+end
+arch woodfloor2
+x 14
+y 3
+end
+arch brazier
+x 14
+y 3
+end
+arch light3
+x 14
+y 3
+end
+arch woodfloor2
+x 14
+y 4
+end
+arch woodfloor2
+x 14
+y 5
+end
+arch woodfloor2
+x 14
+y 6
+end
+arch brazier
+x 14
+y 6
+end
+arch light3
+x 14
+y 6
+end
+arch woodfloor2
+x 14
+y 7
+end
+arch table
+x 14
+y 7
+end
+arch woodfloor2
+x 14
+y 8
+end
+arch table
+x 14
+y 8
+end
+arch woodfloor2
+x 14
+y 9
+end
+arch woodwall_2_1_2
+x 14
+y 9
+end
+arch woodfloor2
+x 15
+end
+arch woodwall_2_1_2
+x 15
+end
+arch woodfloor2
+x 15
+y 1
+end
+arch woodfloor2
+x 15
+y 2
+end
+arch woodfloor2
+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 woodfloor2
+x 15
+y 8
+end
+arch table
+x 15
+y 8
+end
+arch woodfloor2
+x 15
+y 9
+end
+arch woodwall_2_1_2
+x 15
+y 9
+end
+arch woodfloor2
+x 16
+end
+arch woodwall_2_1_2
+x 16
+end
+arch woodfloor2
+x 16
+y 1
+end
+arch brazier
+x 16
+y 1
+end
+arch light2
+x 16
+y 1
+end
+arch woodfloor2
+x 16
+y 2
+end
+arch woodfloor2
+x 16
+y 3
+end
+arch woodfloor2
+x 16
+y 4
+end
+arch woodfloor2
+x 16
+y 5
+end
+arch woodfloor2
+x 16
+y 6
+end
+arch woodwall_2_2_2
+x 16
+y 6
+end
+arch woodfloor2
+x 16
+y 7
+end
+arch woodwall_2_1_1
+x 16
+y 7
+end
+arch woodfloor2
+x 16
+y 8
+end
+arch woodwall_2_1_1
+x 16
+y 8
+end
+arch woodfloor2
+x 16
+y 9
+end
+arch woodwall_3_1
+x 16
+y 9
+end
+arch woodfloor2
+x 17
+end
+arch woodwall_2_1_2
+x 17
+end
+arch woodfloor2
+x 17
+y 1
+end
+arch altar_mostrai
+x 17
+y 1
+end
+arch woodfloor2
+x 17
+y 2
+end
+arch woodfloor2
+x 17
+y 3
+end
+arch woodfloor2
+x 17
+y 4
+end
+arch woodfloor2
+x 17
+y 5
+end
+arch woodfloor2
+x 17
+y 6
+end
+arch woodwall_1_3
+x 17
+y 6
+end
+arch woodfloor2
+x 17
+y 7
+end
+arch woodfloor2
+x 17
+y 8
+end
+arch chair_1.4
+x 17
+y 8
+end
+arch woodfloor2
+x 17
+y 9
+end
+arch woodwall_2_1_2
+x 17
+y 9
+end
+arch woodfloor2
+x 18
+end
+arch woodwall_2_1_2
+x 18
+end
+arch woodfloor2
+x 18
+y 1
+end
+arch brazier
+x 18
+y 1
+end
+arch light2
+x 18
+y 1
+end
+arch woodfloor2
+x 18
+y 2
+end
+arch woodfloor2
+x 18
+y 3
+end
+arch woodfloor2
+x 18
+y 4
+end
+arch woodfloor2
+x 18
+y 5
+end
+arch button_small
+invisible 1
+connected 5
+x 18
+y 5
+end
+arch woodfloor2
+x 18
+y 6
+end
+arch mdoor_closed_1
+connected 5
+x 18
+y 6
+end
+arch woodfloor2
+x 18
+y 7
+end
+arch button_small
+connected 5
+x 18
+y 7
+end
+arch woodfloor2
+x 18
+y 8
+end
+arch table_2
+x 18
+y 8
+end
+arch woodfloor2
+x 18
+y 9
+end
+arch woodwall_2_1_2
+x 18
+y 9
+end
+arch woodfloor2
+x 19
+end
+arch woodwall_2_1_2
+x 19
+end
+arch woodfloor2
+x 19
+y 1
+end
+arch woodfloor2
+x 19
+y 2
+end
+arch woodfloor2
+x 19
+y 3
+end
+arch woodfloor2
+x 19
+y 4
+end
+arch woodfloor2
+x 19
+y 5
+end
+arch woodfloor2
+x 19
+y 6
+end
+arch woodwall_1_4
+x 19
+y 6
+end
+arch woodfloor2
+x 19
+y 7
+end
+arch woodfloor2
+x 19
+y 8
+end
+arch woodfloor2
+x 19
+y 9
+end
+arch woodwall_2_1_2
+x 19
+y 9
+end
+arch woodfloor2
+x 20
+end
+arch woodwall_2_1_2
+x 20
+end
+arch woodfloor2
+x 20
+y 1
+end
+arch woodfloor2
+x 20
+y 2
+end
+arch woodfloor2
+x 20
+y 3
+end
+arch stair_down_2
+slaying grumms_inn
+hp 20
+sp 3
+x 20
+y 3
+end
+arch woodfloor2
+x 20
+y 4
+end
+arch woodfloor2
+x 20
+y 5
+end
+arch brazier
+x 20
+y 5
+end
+arch light3
+x 20
+y 5
+end
+arch woodfloor2
+x 20
+y 6
+end
+arch woodwall_2_1_2
+x 20
+y 6
+end
+arch woodfloor2
+x 20
+y 7
+end
+arch woodfloor2
+x 20
+y 8
+end
+arch bed_save
+x 20
+y 8
+end
+arch woodfloor2
+x 20
+y 9
+end
+arch woodwall_2_1_2
+x 20
+y 9
+end
+arch woodfloor2
+x 21
+end
+arch woodwall_2_2_3
+x 21
+end
+arch woodfloor2
+x 21
+y 1
+end
+arch woodwall_2_1_1
+x 21
+y 1
+end
+arch woodfloor2
+x 21
+y 2
+end
+arch woodwall_2_1_1
+x 21
+y 2
+end
+arch woodfloor2
+x 21
+y 3
+end
+arch woodwall_2_1_1
+x 21
+y 3
+end
+arch woodfloor2
+x 21
+y 4
+end
+arch woodwall_2_1_1
+x 21
+y 4
+end
+arch woodfloor2
+x 21
+y 5
+end
+arch woodwall_2_1_1
+x 21
+y 5
+end
+arch woodfloor2
+x 21
+y 6
+end
+arch woodwall_3_4
+x 21
+y 6
+end
+arch woodfloor2
+x 21
+y 7
+end
+arch woodwall_2_1_1
+x 21
+y 7
+end
+arch woodfloor2
+x 21
+y 8
+end
+arch woodwall_2_1_1
+x 21
+y 8
+end
+arch woodfloor2
+x 21
+y 9
+end
+arch woodwall_2_2_4
+x 21
+y 9
+end
diff --git a/world/world_101_114 b/world/world_101_114
index 41238fe42..3695c5ee9 100644
--- a/world/world_101_114
+++ b/world/world_101_114
@@ -12296,6 +12296,8 @@ type 41
 slaying /port_joseph/pirates/fortvsship
 hp 4
 sp 27
+activate_on_push 1
+activate_on_release 1
 connected 2
 x 15
 y 46
diff --git a/world/world_120_109 b/world/world_120_109
index 4065c6382..791dab512 100644
--- a/world/world_120_109
+++ b/world/world_120_109
@@ -6889,6 +6889,7 @@ x 27
 y 40
 end
 arch mountain_cave2
+name mine
 x 27
 y 41
 end
@@ -7425,6 +7426,7 @@ x 29
 y 44
 end
 arch mountain_cave2
+name mine
 x 29
 y 44
 end
@@ -8717,7 +8719,7 @@ x 34
 y 47
 end
 arch hills
-elevation 3787
+elevation 4227
 x 34
 y 48
 end
@@ -10225,6 +10227,7 @@ x 40
 y 45
 end
 arch tower_tob
+name outpost
 x 40
 y 45
 end
@@ -10707,6 +10710,10 @@ elevation 2186
 x 42
 y 43
 end
+arch light3
+x 42
+y 43
+end
 arch hills
 elevation 2135
 x 42
@@ -11217,6 +11224,11 @@ elevation 3423
 x 44
 y 43
 end
+arch shrine
+name shrine of Gaia
+x 44
+y 43
+end
 arch hills
 elevation 2985
 x 44
@@ -11494,10 +11506,6 @@ arch hills
 x 45
 y 44
 end
-arch s_shop2
-x 45
-y 44
-end
 arch hills
 x 45
 y 45
@@ -12516,6 +12524,10 @@ x 39
 y 43
 end
 arch inn
+name Grumm's Inn
+slaying /inn_and_outpost/grumms_inn
+hp 7
+sp 13
 x 42
 y 43
 end