diff --git a/start/HallsOfSelection/dwarf_player b/start/HallsOfSelection/dwarf_player
index 61be576..855bb81 100644
--- a/start/HallsOfSelection/dwarf_player
+++ b/start/HallsOfSelection/dwarf_player
@@ -3,12 +3,12 @@ name Hall Of Selection, Dwarf
 difficulty 1
 region creation
 width 15
-height 34
+height 36
 enter_x 7
 enter_y 5
 msg
 Created:  2000-10-12
-Modified: 2018-06-25 kts
+Modified: 2018-06-28 kts
 endmsg
 end
 arch blocked
@@ -207,9 +207,25 @@ name floor
 face shop_empty.111
 y 33
 end
-arch mine_sw
+arch mine_3_2
 y 33
 end
+arch flagstone
+name floor
+face shop_empty.111
+y 34
+end
+arch mine_3_2
+y 34
+end
+arch flagstone
+name floor
+face shop_empty.111
+y 35
+end
+arch mine_sw
+y 35
+end
 arch permanent_lava
 x 1
 end
@@ -296,25 +312,25 @@ arch tile_white_floor
 x 1
 y 16
 end
-arch dwarf_mage_class
+arch dwarf_necromancer_class
 x 1
 y 16
 end
-arch stonefloor2
+arch flagstone
+name floor
+face shop_empty.111
 x 1
 y 17
 end
-arch mine_3_1
-name mine
+arch mine13
 x 1
 y 17
-blocksview 0
 end
 arch tile_white_floor
 x 1
 y 18
 end
-arch evoker_class
+arch dwarf_warlock_class
 x 1
 y 18
 end
@@ -332,28 +348,27 @@ arch tile_white_floor
 x 1
 y 20
 end
+arch dwarf_evoker_class
+x 1
+y 20
+end
+arch stonefloor2
+x 1
+y 21
+end
+arch mine_3_1
+name mine
+x 1
+y 21
+blocksview 0
+end
+arch tile_white_floor
+x 1
+y 22
+end
 arch summoner_class
 face wizard_yellow.151
 x 1
-y 20
-end
-arch stonefloor2
-x 1
-y 21
-end
-arch mine_3_1
-name mine
-x 1
-y 21
-blocksview 0
-end
-arch tile_white_floor
-x 1
-y 22
-end
-arch wizard
-face wizard.151
-x 1
 y 22
 end
 arch stonefloor2
@@ -370,7 +385,7 @@ arch tile_white_floor
 x 1
 y 24
 end
-arch alchemist_class
+arch dwarf_wizard_class
 x 1
 y 24
 end
@@ -388,8 +403,7 @@ arch tile_white_floor
 x 1
 y 26
 end
-arch sorcerer_class
-face sorcerer.151
+arch dwarf_alchemist_class
 x 1
 y 26
 end
@@ -407,8 +421,7 @@ arch tile_white_floor
 x 1
 y 28
 end
-arch devotee_class
-face wizard_white.151
+arch dwarf_sorcerer_class
 x 1
 y 28
 end
@@ -426,6 +439,11 @@ arch tile_white_floor
 x 1
 y 30
 end
+arch devotee_class
+face wizard_white.151
+x 1
+y 30
+end
 arch stonefloor2
 x 1
 y 31
@@ -440,15 +458,29 @@ arch tile_white_floor
 x 1
 y 32
 end
-arch flagstone
-name floor
-face shop_empty.111
+arch stonefloor2
 x 1
 y 33
 end
 arch mine_3_1
+name mine
 x 1
 y 33
+blocksview 0
+end
+arch tile_white_floor
+x 1
+y 34
+end
+arch flagstone
+name floor
+face shop_empty.111
+x 1
+y 35
+end
+arch mine_3_1
+x 1
+y 35
 end
 arch permanent_lava
 x 2
@@ -548,10 +580,8 @@ x 2
 y 17
 end
 arch mine13
-name mine
 x 2
 y 17
-blocksview 0
 end
 arch swall_1_1_half
 x 2
@@ -739,9 +769,33 @@ face shop_empty.111
 x 2
 y 33
 end
+arch mine13
+name mine
+x 2
+y 33
+blocksview 0
+end
+arch swall_1_1_half
+x 2
+y 33
+end
+arch stonefloor2
+x 2
+y 34
+end
+arch swall_2_1_1
+x 2
+y 34
+end
+arch flagstone
+name floor
+face shop_empty.111
+x 2
+y 35
+end
 arch mine_3_1
 x 2
-y 33
+y 35
 end
 arch permanent_lava
 x 3
@@ -830,193 +884,216 @@ hp 12
 sp 12
 x 3
 y 16
-arch dwarf_mage_class
+arch dwarf_necromancer_class
 end
 end
-arch stonefloor2
-x 3
-y 17
-end
-arch mine_3_1
-name mine
-x 3
-y 17
-blocksview 0
-end
-arch dungeon_floor
-x 3
-y 18
-end
-arch player_changer
-slaying /start/Nexus
-hp 12
-sp 12
-x 3
-y 18
-arch evoker_class
-end
-end
-arch stonefloor2
-x 3
-y 19
-end
-arch mine_3_1
-name mine
-x 3
-y 19
-blocksview 0
-end
-arch dungeon_floor
-x 3
-y 20
-end
-arch player_changer
-slaying /start/Nexus
-hp 12
-sp 12
-x 3
-y 20
-arch summoner_class
-end
-end
-arch stonefloor2
-x 3
-y 21
-end
-arch mine_3_1
-name mine
-x 3
-y 21
-blocksview 0
-end
-arch dungeon_floor
-x 3
-y 22
-end
-arch player_changer
-slaying /start/Nexus
-hp 12
-sp 12
-x 3
-y 22
-carrying 70000
-arch wizard
-end
-end
-arch stonefloor2
-x 3
-y 23
-end
-arch mine_3_1
-name mine
-x 3
-y 23
-blocksview 0
-end
-arch dungeon_floor
-x 3
-y 24
-end
-arch player_changer
-slaying /start/Nexus
-hp 12
-sp 12
-x 3
-y 24
-arch alchemist_class
-end
-end
-arch stonefloor2
-x 3
-y 25
-end
-arch mine_3_1
-name mine
-x 3
-y 25
-blocksview 0
-end
-arch dungeon_floor
-x 3
-y 26
-end
-arch player_changer
-slaying /start/Nexus
-hp 12
-sp 12
-x 3
-y 26
-arch sorcerer_class
-end
-end
-arch stonefloor2
-x 3
-y 27
-end
-arch mine_3_1
-name mine
-x 3
-y 27
-blocksview 0
-end
-arch dungeon_floor
-x 3
-y 28
-end
-arch player_changer
-slaying /start/Nexus
-hp 12
-sp 12
-x 3
-y 28
-arch devotee_class
-end
-end
-arch stonefloor2
-x 3
-y 29
-end
-arch mine_3_1
-name mine
-x 3
-y 29
-blocksview 0
-end
-arch dungeon_floor
-x 3
-y 30
-end
-arch dungeon_magic
-x 3
-y 30
-end
-arch stonefloor2
-x 3
-y 31
-end
-arch mine_3_1
-name mine
-x 3
-y 31
-blocksview 0
-end
-arch dungeon_floor
-x 3
-y 32
-end
-arch dungeon_magic
-x 3
-y 32
-end
 arch flagstone
 name floor
 face shop_empty.111
 x 3
+y 17
+end
+arch mine13
+x 3
+y 17
+end
+arch dungeon_floor
+x 3
+y 18
+end
+arch player_changer
+slaying /start/Nexus
+hp 12
+sp 12
+x 3
+y 18
+arch dwarf_warlock_class
+end
+end
+arch stonefloor2
+x 3
+y 19
+end
+arch mine_3_1
+name mine
+x 3
+y 19
+blocksview 0
+end
+arch dungeon_floor
+x 3
+y 20
+end
+arch player_changer
+slaying /start/Nexus
+hp 12
+sp 12
+x 3
+y 20
+arch dwarf_evoker_class
+end
+end
+arch stonefloor2
+x 3
+y 21
+end
+arch mine_3_1
+name mine
+x 3
+y 21
+blocksview 0
+end
+arch dungeon_floor
+x 3
+y 22
+end
+arch player_changer
+slaying /start/Nexus
+hp 12
+sp 12
+x 3
+y 22
+arch summoner_class
+end
+end
+arch stonefloor2
+x 3
+y 23
+end
+arch mine_3_1
+name mine
+x 3
+y 23
+blocksview 0
+end
+arch dungeon_floor
+x 3
+y 24
+end
+arch player_changer
+slaying /start/Nexus
+hp 12
+sp 12
+x 3
+y 24
+carrying 70000
+arch dwarf_wizard_class
+end
+end
+arch stonefloor2
+x 3
+y 25
+end
+arch mine_3_1
+name mine
+x 3
+y 25
+blocksview 0
+end
+arch dungeon_floor
+x 3
+y 26
+end
+arch player_changer
+slaying /start/Nexus
+hp 12
+sp 12
+x 3
+y 26
+arch dwarf_alchemist_class
+end
+end
+arch stonefloor2
+x 3
+y 27
+end
+arch mine_3_1
+name mine
+x 3
+y 27
+blocksview 0
+end
+arch dungeon_floor
+x 3
+y 28
+end
+arch player_changer
+slaying /start/Nexus
+hp 12
+sp 12
+x 3
+y 28
+arch dwarf_sorcerer_class
+end
+end
+arch stonefloor2
+x 3
+y 29
+end
+arch mine_3_1
+name mine
+x 3
+y 29
+blocksview 0
+end
+arch dungeon_floor
+x 3
+y 30
+end
+arch player_changer
+slaying /start/Nexus
+hp 12
+sp 12
+x 3
+y 30
+arch devotee_class
+end
+end
+arch stonefloor2
+x 3
+y 31
+end
+arch mine_3_1
+name mine
+x 3
+y 31
+blocksview 0
+end
+arch dungeon_floor
+x 3
+y 32
+end
+arch dungeon_magic
+x 3
+y 32
+end
+arch stonefloor2
+x 3
 y 33
 end
 arch mine_3_1
+name mine
 x 3
 y 33
+blocksview 0
+end
+arch dungeon_floor
+x 3
+y 34
+end
+arch dungeon_magic
+x 3
+y 34
+end
+arch flagstone
+name floor
+face shop_empty.111
+x 3
+y 35
+end
+arch mine_3_1
+x 3
+y 35
 end
 arch permanent_lava
 x 4
@@ -1103,7 +1180,7 @@ y 15
 end
 arch magic_mouth
 msg
-Step forward to become a Warlock.
+Step forward to become a Necromancer.
 endmsg
 x 4
 y 16
@@ -1116,14 +1193,39 @@ arch dungeon_magic
 x 4
 y 16
 end
-arch stonefloor2
+arch flagstone
+name floor
+face shop_empty.111
 x 4
 y 17
 end
+arch mine13
+x 4
+y 17
+end
+arch magic_mouth
+msg
+Step forward to become a Warlock.
+endmsg
+x 4
+y 18
+end
+arch dungeon_floor
+x 4
+y 18
+end
+arch dungeon_magic
+x 4
+y 18
+end
+arch stonefloor2
+x 4
+y 19
+end
 arch mine_3_1
 name mine
 x 4
-y 17
+y 19
 blocksview 0
 end
 arch magic_mouth
@@ -1131,24 +1233,24 @@ msg
 Step forward to become an Evoker.
 endmsg
 x 4
-y 18
+y 20
 end
 arch dungeon_floor
 x 4
-y 18
+y 20
 end
 arch dungeon_magic
 x 4
-y 18
+y 20
 end
 arch stonefloor2
 x 4
-y 19
+y 21
 end
 arch mine_3_1
 name mine
 x 4
-y 19
+y 21
 blocksview 0
 end
 arch magic_mouth
@@ -1156,24 +1258,24 @@ msg
 Step forward to become a Summoner.
 endmsg
 x 4
-y 20
+y 22
 end
 arch dungeon_floor
 x 4
-y 20
+y 22
 end
 arch dungeon_magic
 x 4
-y 20
+y 22
 end
 arch stonefloor2
 x 4
-y 21
+y 23
 end
 arch mine_3_1
 name mine
 x 4
-y 21
+y 23
 blocksview 0
 end
 arch magic_mouth
@@ -1181,24 +1283,24 @@ msg
 Step forward to become a Wizard.
 endmsg
 x 4
-y 22
+y 24
 end
 arch dungeon_floor
 x 4
-y 22
+y 24
 end
 arch dungeon_magic
 x 4
-y 22
+y 24
 end
 arch stonefloor2
 x 4
-y 23
+y 25
 end
 arch mine_3_1
 name mine
 x 4
-y 23
+y 25
 blocksview 0
 end
 arch magic_mouth
@@ -1207,24 +1309,24 @@ Step forward to become an Alchemist.
 Alchemists are for somewhat advanced players.
 endmsg
 x 4
-y 24
+y 26
 end
 arch dungeon_floor
 x 4
-y 24
+y 26
 end
 arch dungeon_magic
 x 4
-y 24
+y 26
 end
 arch stonefloor2
 x 4
-y 25
+y 27
 end
 arch mine_3_1
 name mine
 x 4
-y 25
+y 27
 blocksview 0
 end
 arch magic_mouth
@@ -1233,24 +1335,24 @@ Step forward to become a Sorcerer.
 Sorcerers are difficult to play and not recommended for beginners.
 endmsg
 x 4
-y 26
+y 28
 end
 arch dungeon_floor
 x 4
-y 26
+y 28
 end
 arch dungeon_magic
 x 4
-y 26
+y 28
 end
 arch stonefloor2
 x 4
-y 27
+y 29
 end
 arch mine_3_1
 name mine
 x 4
-y 27
+y 29
 blocksview 0
 end
 arch magic_mouth
@@ -1258,25 +1360,7 @@ msg
 Step forward to become a Devotee.
 endmsg
 x 4
-y 28
-end
-arch dungeon_floor
-x 4
-y 28
-end
-arch dungeon_magic
-x 4
-y 28
-end
-arch stonefloor2
-x 4
-y 29
-end
-arch mine_3_1
-name mine
-x 4
-y 29
-blocksview 0
+y 30
 end
 arch dungeon_floor
 x 4
@@ -1304,15 +1388,33 @@ arch dungeon_magic
 x 4
 y 32
 end
+arch stonefloor2
+x 4
+y 33
+end
+arch mine_3_1
+name mine
+x 4
+y 33
+blocksview 0
+end
+arch dungeon_floor
+x 4
+y 34
+end
+arch dungeon_magic
+x 4
+y 34
+end
 arch flagstone
 name floor
 face shop_empty.111
 x 4
-y 33
+y 35
 end
 arch mine_3_1
 x 4
-y 33
+y 35
 end
 arch permanent_lava
 x 5
@@ -1419,9 +1521,10 @@ y 15
 end
 arch magic_mouth
 msg
-Warlock
-You've divided your time between learning magic and learning weapons, but have totally disregarded religious devotion.
-You're physically stronger and hardier because of your training, and you know the use of weapons and bows.  However, you're just a bit clumsy in both weaponry and magic because you've had to divide your time between them.
+Necromancer (Dwarf exclusive)
+As a Necromancer, you've spent much time studying both magic and religion -- or, at least, religion as far as it
+pertains to the denizens of the night. As a result of your intense studying, you have no experience with melee combat
+and have mostly disregarded your body.
 endmsg
 x 5
 y 16
@@ -1434,14 +1537,41 @@ arch dungeon_magic
 x 5
 y 16
 end
-arch dungeon_floor
+arch flagstone
+name floor
+face shop_empty.111
 x 5
 y 17
 end
+arch mine13
+x 5
+y 17
+end
+arch magic_mouth
+msg
+Warlock
+You've divided your time between learning magic and learning weapons, but have totally disregarded religious devotion.
+You're physically stronger and hardier because of your training, and you know the use of weapons and bows.  However, you're just a bit clumsy in both weaponry and magic because you've had to divide your time between them.
+endmsg
+x 5
+y 18
+end
+arch dungeon_floor
+x 5
+y 18
+end
+arch dungeon_magic
+x 5
+y 18
+end
+arch dungeon_floor
+x 5
+y 19
+end
 arch mine_2_2_4
 name mine
 x 5
-y 17
+y 19
 blocksview 0
 end
 arch magic_mouth
@@ -1453,24 +1583,24 @@ You've never learned to use magic innately, but instead rely on a magic talisman
 You have not been trained in religious devotion:  however, you come from a religious family and will have no particular difficulty taking up the service of a god.
 endmsg
 x 5
-y 18
+y 20
 end
 arch dungeon_floor
 x 5
-y 18
+y 20
 end
 arch dungeon_magic
 x 5
-y 18
+y 20
 end
 arch dungeon_floor
 x 5
-y 19
+y 21
 end
 arch mine_2_2_4
 name mine
 x 5
-y 19
+y 21
 blocksview 0
 end
 arch magic_mouth
@@ -1481,24 +1611,24 @@ Your work has leaned heavily toward the art of summoning creatures to help you i
 You've also had a reasonable education in religious devotion.
 endmsg
 x 5
-y 20
+y 22
 end
 arch dungeon_floor
 x 5
-y 20
+y 22
 end
 arch dungeon_magic
 x 5
-y 20
+y 22
 end
 arch dungeon_floor
 x 5
-y 21
+y 23
 end
 arch mine_2_2_4
 name mine
 x 5
-y 21
+y 23
 blocksview 0
 end
 arch magic_mouth
@@ -1509,24 +1639,24 @@ You've learned something about the gods and religious devotion as well.
 To a much lesser extent, you've studied weaponry, but you've not had much physical training:  you're mostly sedentary, and so you're not nearly so strong and healthy as you could be.
 endmsg
 x 5
-y 22
+y 24
 end
 arch dungeon_floor
 x 5
-y 22
+y 24
 end
 arch dungeon_magic
 x 5
-y 22
+y 24
 end
 arch dungeon_floor
 x 5
-y 23
+y 25
 end
 arch mine_2_2_4
 name mine
 x 5
-y 23
+y 25
 blocksview 0
 end
 arch magic_mouth
@@ -1538,24 +1668,24 @@ Your focus, however, has left little time for physical training, and your sedent
 Your dependence on magical devices extends to the use of a talisman to channel mana.  The talisman has become attuned to detonation and transmutation because of the way you have used it.
 endmsg
 x 5
-y 24
+y 26
 end
 arch dungeon_floor
 x 5
-y 24
+y 26
 end
 arch dungeon_magic
 x 5
-y 24
+y 26
 end
 arch dungeon_floor
 x 5
-y 25
+y 27
 end
 arch mine_2_2_4
 name mine
 x 5
-y 25
+y 27
 blocksview 0
 end
 arch magic_mouth
@@ -1567,24 +1697,24 @@ On the other hand, you have totally neglected to learn to use weaponry, so you'r
 Your study of magical devices allows you to notice when an object has a magical aura, and you are often able to fathom the purpose of magical devices.
 endmsg
 x 5
-y 26
+y 28
 end
 arch dungeon_floor
 x 5
-y 26
+y 28
 end
 arch dungeon_magic
 x 5
-y 26
+y 28
 end
 arch dungeon_floor
 x 5
-y 27
+y 29
 end
 arch mine_2_2_4
 name mine
 x 5
-y 27
+y 29
 blocksview 0
 end
 arch magic_mouth
@@ -1595,25 +1725,7 @@ Your sensitivity to godly powers has also caused your natural magical ability to
 Your religious superiors have forced you to learn weaponry against your choice, but you will find that they were wise to do so.  You haven't trained as assiduously as you should have, so you are soft and weak.
 endmsg
 x 5
-y 28
-end
-arch dungeon_floor
-x 5
-y 28
-end
-arch dungeon_magic
-x 5
-y 28
-end
-arch dungeon_floor
-x 5
-y 29
-end
-arch mine_2_2_4
-name mine
-x 5
-y 29
-blocksview 0
+y 30
 end
 arch dungeon_floor
 x 5
@@ -1641,15 +1753,33 @@ arch dungeon_magic
 x 5
 y 32
 end
+arch dungeon_floor
+x 5
+y 33
+end
+arch mine_2_2_4
+name mine
+x 5
+y 33
+blocksview 0
+end
+arch dungeon_floor
+x 5
+y 34
+end
+arch dungeon_magic
+x 5
+y 34
+end
 arch flagstone
 name floor
 face shop_empty.111
 x 5
-y 33
+y 35
 end
 arch mine_3_1
 x 5
-y 33
+y 35
 end
 arch permanent_lava
 x 6
@@ -1793,13 +1923,15 @@ arch dungeon_magic
 x 6
 y 16
 end
-arch dungeon_floor
+arch graymarble
 x 6
 y 17
 end
-arch dungeon_magic
+arch mine_2_2_4
+name mine
 x 6
 y 17
+blocksview 0
 end
 arch dungeon_floor
 x 6
@@ -1921,15 +2053,31 @@ arch dungeon_magic
 x 6
 y 32
 end
+arch dungeon_floor
+x 6
+y 33
+end
+arch dungeon_magic
+x 6
+y 33
+end
+arch dungeon_floor
+x 6
+y 34
+end
+arch dungeon_magic
+x 6
+y 34
+end
 arch flagstone
 name floor
 face shop_empty.111
 x 6
-y 33
+y 35
 end
 arch mine_3_1
 x 6
-y 33
+y 35
 end
 arch permanent_lava
 x 7
@@ -2164,7 +2312,7 @@ endmsg
 x 7
 y 14
 end
-arch cobblestones2
+arch dungeon_floor
 x 7
 y 14
 end
@@ -2179,15 +2327,15 @@ Note that your character's statistics like strength, dexterity, and so on, will
 It may be helpful to choose a class keeping in mind which statistics are high and low.  For example, it may not be wise to pick a warrior class if your character has very low strength, and electing a magical class with a very low power statistic may prevent your character from using magic until artifacts may be found that raise your characters statistics to a useful level.
 endmsg
 x 7
-y 14
+y 15
 end
 arch dungeon_floor
 x 7
-y 14
+y 15
 end
 arch dungeon_magic
 x 7
-y 14
+y 15
 end
 arch magic_mouth
 msg
@@ -2199,15 +2347,7 @@ forward onto the circle for that
 class.
 endmsg
 x 7
-y 15
-end
-arch dungeon_floor
-x 7
-y 15
-end
-arch dungeon_magic
-x 7
-y 15
+y 16
 end
 arch dungeon_floor
 x 7
@@ -2345,15 +2485,31 @@ arch dungeon_magic
 x 7
 y 32
 end
+arch dungeon_floor
+x 7
+y 33
+end
+arch dungeon_magic
+x 7
+y 33
+end
+arch dungeon_floor
+x 7
+y 34
+end
+arch dungeon_magic
+x 7
+y 34
+end
 arch flagstone
 name floor
 face shop_empty.111
 x 7
-y 33
+y 35
 end
 arch mine_3_1
 x 7
-y 33
+y 35
 end
 arch earth
 x 8
@@ -2484,6 +2640,13 @@ arch mine_sw
 x 8
 y 15
 end
+arch magic_mouth
+msg
+This path leads to the dwarf-exclusive class, the Giant Killer.
+endmsg
+x 8
+y 16
+end
 arch dungeon_floor
 x 8
 y 16
@@ -2492,11 +2655,11 @@ arch dungeon_magic
 x 8
 y 16
 end
-arch dungeon_floor
+arch graymarble
 x 8
 y 17
 end
-arch dungeon_magic
+arch mine_1_4
 x 8
 y 17
 end
@@ -2620,15 +2783,31 @@ arch dungeon_magic
 x 8
 y 32
 end
+arch dungeon_floor
+x 8
+y 33
+end
+arch dungeon_magic
+x 8
+y 33
+end
+arch dungeon_floor
+x 8
+y 34
+end
+arch dungeon_magic
+x 8
+y 34
+end
 arch flagstone
 name floor
 face shop_empty.111
 x 8
-y 33
+y 35
 end
 arch mine_3_1
 x 8
-y 33
+y 35
 end
 arch earth
 x 9
@@ -2735,10 +2914,12 @@ y 15
 end
 arch magic_mouth
 msg
-Warrior
-As a Warrior you've been trained in the art of combat with weapons and in archery.
-Because of your training, you're stronger, more agile, and hardier than you would be otherwise.
-Your education, however, has not included studies in the magical arts or religious devotion, and, in general, lacks breadth.
+Giant Killer (Dwarf exclusive)
+As a Giant Killer, you've been trained to take down foes much larger than yourself.
+Because of this training, you not only possess a great deal of strength and agility,
+but you gain an innate bonus against giants and their kind.
+However, due to this focus you have not studied magical arts and find the gods, although
+helpful, not a necessity when it comes to slaughtering giants.
 endmsg
 x 9
 y 16
@@ -2751,14 +2932,42 @@ arch dungeon_magic
 x 9
 y 16
 end
-arch dungeon_floor
+arch flagstone
+name floor
+face shop_empty.111
 x 9
 y 17
 end
+arch mine13
+x 9
+y 17
+end
+arch magic_mouth
+msg
+Warrior
+As a Warrior you've been trained in the art of combat with weapons and in archery.
+Because of your training, you're stronger, more agile, and hardier than you would be otherwise.
+Your education, however, has not included studies in the magical arts or religious devotion, and, in general, lacks breadth.
+endmsg
+x 9
+y 18
+end
+arch dungeon_floor
+x 9
+y 18
+end
+arch dungeon_magic
+x 9
+y 18
+end
+arch dungeon_floor
+x 9
+y 19
+end
 arch mine_1_4
 name mine
 x 9
-y 17
+y 19
 blocksview 0
 end
 arch magic_mouth
@@ -2770,24 +2979,24 @@ You're deeply afraid of magic, and it'll be a while before you get over that and
 You've no deep problem with the idea of gods, but you don't know much about them.
 endmsg
 x 9
-y 18
+y 20
 end
 arch dungeon_floor
 x 9
-y 18
+y 20
 end
 arch dungeon_magic
 x 9
-y 18
+y 20
 end
 arch dungeon_floor
 x 9
-y 19
+y 21
 end
 arch mine_1_4
 name mine
 x 9
-y 19
+y 21
 blocksview 0
 end
 arch magic_mouth
@@ -2798,24 +3007,24 @@ Having spent much of your life living and hunting in the wild, you have learned
 Although you've never taken part in religious devotion, your time amongst the spirits of the forest has led you to have no ambivalence towards the spiritual world. Magical arts, however, you have had no taste for, as one too many times has it destroyed your camps and the forests you had grown to enjoy.
 endmsg
 x 9
-y 20
+y 22
 end
 arch dungeon_floor
 x 9
-y 20
+y 22
 end
 arch dungeon_magic
 x 9
-y 20
+y 22
 end
 arch dungeon_floor
 x 9
-y 21
+y 23
 end
 arch mine_1_4
 name mine
 x 9
-y 21
+y 23
 blocksview 0
 end
 arch magic_mouth
@@ -2826,24 +3035,24 @@ You've learned to make the most of your time in port:  after passing out drunk i
 On numerous occasions, you've taken up arms and bow in defense of your ship, so you're facile with weapons, but you've had no chance to learn magic or the ways of gods.
 endmsg
 x 9
-y 22
+y 24
 end
 arch dungeon_floor
 x 9
-y 22
+y 24
 end
 arch dungeon_magic
 x 9
-y 22
+y 24
 end
 arch dungeon_floor
 x 9
-y 23
+y 25
 end
 arch mine_1_4
 name mine
 x 9
-y 23
+y 25
 blocksview 0
 end
 arch magic_mouth
@@ -2853,24 +3062,24 @@ As a member of the secret society of the Ninja, you've been taught archery, the
 You have had no introduction to either religious devotion or magic.
 endmsg
 x 9
-y 24
+y 26
 end
 arch dungeon_floor
 x 9
-y 24
+y 26
 end
 arch dungeon_magic
 x 9
-y 24
+y 26
 end
 arch dungeon_floor
 x 9
-y 25
+y 27
 end
 arch mine_1_4
 name mine
 x 9
-y 25
+y 27
 blocksview 0
 end
 arch magic_mouth
@@ -2881,24 +3090,24 @@ You've had some weaponry training, including archery; this being advisable to so
 You've had no time for either religious devotion or the study of magecraft, but your quick wits have been enough to keep you alive so far.
 endmsg
 x 9
-y 26
+y 28
 end
 arch dungeon_floor
 x 9
-y 26
+y 28
 end
 arch dungeon_magic
 x 9
-y 26
+y 28
 end
 arch dungeon_floor
 x 9
-y 27
+y 29
 end
 arch mine_1_4
 name mine
 x 9
-y 27
+y 29
 blocksview 0
 end
 arch magic_mouth
@@ -2909,24 +3118,24 @@ Your mental equilibrium requires you to forego the use of weapons, but your phys
 Your inner peace grants you the ability to regenerate faster and to sense metaphysical auras.
 endmsg
 x 9
-y 28
+y 30
 end
 arch dungeon_floor
 x 9
-y 28
+y 30
 end
 arch dungeon_magic
 x 9
-y 28
+y 30
 end
 arch dungeon_floor
 x 9
-y 29
+y 31
 end
 arch mine_1_4
 name mine
 x 9
-y 29
+y 31
 blocksview 0
 end
 arch magic_mouth
@@ -2937,24 +3146,24 @@ You've been taught archery and the use of weapons, but great care has been taken
 All other areas of your education have been neglected.  Perhaps aware of your deficiency, your superiors have given you some measure of protection from magic.
 endmsg
 x 9
-y 30
+y 32
 end
 arch dungeon_floor
 x 9
-y 30
+y 32
 end
 arch dungeon_magic
 x 9
-y 30
+y 32
 end
 arch dungeon_floor
 x 9
-y 31
+y 33
 end
 arch mine_1_4
 name mine
 x 9
-y 31
+y 33
 blocksview 0
 end
 arch magic_mouth
@@ -2965,25 +3174,25 @@ You've been taught the use of weapons, but only cursorily, and your physical tra
 Since you're in tune with the holy powers, you can tell when a god has marked an object as accursed.
 endmsg
 x 9
-y 32
+y 34
 end
 arch dungeon_floor
 x 9
-y 32
+y 34
 end
 arch dungeon_magic
 x 9
-y 32
+y 34
 end
 arch flagstone
 name floor
 face shop_empty.111
 x 9
-y 33
+y 35
 end
 arch mine_3_1
 x 9
-y 33
+y 35
 end
 arch earth
 x 10
@@ -3056,7 +3265,7 @@ y 15
 end
 arch magic_mouth
 msg
-Step on the circle to become a Warrior.
+Step on the circle to become a Giant Killer.
 endmsg
 x 10
 y 16
@@ -3076,9 +3285,34 @@ x 10
 y 17
 end
 arch mine13
-name mine
 x 10
 y 17
+end
+arch magic_mouth
+msg
+Step on the circle to become a Warrior.
+endmsg
+x 10
+y 18
+end
+arch dungeon_floor
+x 10
+y 18
+end
+arch dungeon_magic
+x 10
+y 18
+end
+arch flagstone
+name floor
+face shop_empty.111
+x 10
+y 19
+end
+arch mine13
+name mine
+x 10
+y 19
 blocksview 0
 end
 arch magic_mouth
@@ -3086,26 +3320,26 @@ msg
 Step onto the circle to become a Barbarian.
 endmsg
 x 10
-y 18
+y 20
 end
 arch dungeon_floor
 x 10
-y 18
+y 20
 end
 arch dungeon_magic
 x 10
-y 18
+y 20
 end
 arch flagstone
 name floor
 face shop_empty.111
 x 10
-y 19
+y 21
 end
 arch mine13
 name mine
 x 10
-y 19
+y 21
 blocksview 0
 end
 arch magic_mouth
@@ -3113,26 +3347,26 @@ msg
 Step forward to become a Ranger.
 endmsg
 x 10
-y 20
+y 22
 end
 arch dungeon_floor
 x 10
-y 20
+y 22
 end
 arch dungeon_magic
 x 10
-y 20
+y 22
 end
 arch flagstone
 name floor
 face shop_empty.111
 x 10
-y 21
+y 23
 end
 arch mine13
 name mine
 x 10
-y 21
+y 23
 blocksview 0
 end
 arch magic_mouth
@@ -3140,26 +3374,26 @@ msg
 Step forward to become a Swashbuckler.
 endmsg
 x 10
-y 22
+y 24
 end
 arch dungeon_floor
 x 10
-y 22
+y 24
 end
 arch dungeon_magic
 x 10
-y 22
+y 24
 end
 arch flagstone
 name floor
 face shop_empty.111
 x 10
-y 23
+y 25
 end
 arch mine13
 name mine
 x 10
-y 23
+y 25
 blocksview 0
 end
 arch magic_mouth
@@ -3167,26 +3401,26 @@ msg
 Step forward to become a Ninja.
 endmsg
 x 10
-y 24
+y 26
 end
 arch dungeon_floor
 x 10
-y 24
+y 26
 end
 arch dungeon_magic
 x 10
-y 24
+y 26
 end
 arch flagstone
 name floor
 face shop_empty.111
 x 10
-y 25
+y 27
 end
 arch mine13
 name mine
 x 10
-y 25
+y 27
 blocksview 0
 end
 arch magic_mouth
@@ -3194,26 +3428,26 @@ msg
 Step forward to become a Thief.
 endmsg
 x 10
-y 26
+y 28
 end
 arch dungeon_floor
 x 10
-y 26
+y 28
 end
 arch dungeon_magic
 x 10
-y 26
+y 28
 end
 arch flagstone
 name floor
 face shop_empty.111
 x 10
-y 27
+y 29
 end
 arch mine13
 name mine
 x 10
-y 27
+y 29
 blocksview 0
 end
 arch magic_mouth
@@ -3223,26 +3457,26 @@ Beware!  Monks cannot use weapons.
 This is a significant handicap:  experienced players only.
 endmsg
 x 10
-y 28
+y 30
 end
 arch dungeon_floor
 x 10
-y 28
+y 30
 end
 arch dungeon_magic
 x 10
-y 28
+y 30
 end
 arch flagstone
 name floor
 face shop_empty.111
 x 10
-y 29
+y 31
 end
 arch mine13
 name mine
 x 10
-y 29
+y 31
 blocksview 0
 end
 arch magic_mouth
@@ -3250,26 +3484,26 @@ msg
 Step forward to become a Paladin.
 endmsg
 x 10
-y 30
+y 32
 end
 arch dungeon_floor
 x 10
-y 30
+y 32
 end
 arch dungeon_magic
 x 10
-y 30
+y 32
 end
 arch flagstone
 name floor
 face shop_empty.111
 x 10
-y 31
+y 33
 end
 arch mine13
 name mine
 x 10
-y 31
+y 33
 blocksview 0
 end
 arch magic_mouth
@@ -3277,25 +3511,25 @@ msg
 Step forward to become a Priest.
 endmsg
 x 10
-y 32
+y 34
 end
 arch dungeon_floor
 x 10
-y 32
+y 34
 end
 arch dungeon_magic
 x 10
-y 32
+y 34
 end
 arch flagstone
 name floor
 face shop_empty.111
 x 10
-y 33
+y 35
 end
 arch mine_3_1
 x 10
-y 33
+y 35
 end
 arch earth
 x 11
@@ -3380,52 +3614,75 @@ hp 12
 sp 12
 x 11
 y 16
+arch dwarf_giant_killer_class
+end
+end
+arch flagstone
+name floor
+face shop_empty.111
+x 11
+y 17
+end
+arch mine13
+x 11
+y 17
+end
+arch dungeon_floor
+x 11
+y 18
+end
+arch player_changer
+slaying /start/Nexus
+hp 12
+sp 12
+x 11
+y 18
 arch dwarf_warrior_class
 end
 end
 arch stonefloor2
 x 11
-y 17
+y 19
 end
 arch mine_3_1
 name mine
 x 11
-y 17
+y 19
 blocksview 0
 end
 arch dungeon_floor
 x 11
-y 18
+y 20
 end
 arch player_changer
 slaying /start/Nexus
 hp 12
 sp 12
 x 11
-y 18
+y 20
 arch dwarf_barbarian_class
 end
 end
 arch stonefloor2
 x 11
-y 19
+y 21
 end
 arch mine_3_1
 name mine
 x 11
-y 19
+y 21
 blocksview 0
 end
 arch dungeon_floor
 x 11
-y 20
+y 22
 end
 arch player_changer
 slaying /start/Nexus
 hp 12
 sp 12
 x 11
-y 20
+y 22
 arch ranger_class
 name ranger
 msg
@@ -3437,75 +3694,52 @@ end
 end
 arch stonefloor2
 x 11
-y 21
+y 23
 end
 arch mine_3_1
 name mine
 x 11
-y 21
+y 23
 blocksview 0
 end
 arch dungeon_floor
 x 11
-y 22
+y 24
 end
 arch player_changer
 slaying /start/Nexus
 hp 12
 sp 12
 x 11
-y 22
+y 24
 arch swashbuckler_class
 end
 end
 arch stonefloor2
 x 11
-y 23
+y 25
 end
 arch mine_3_1
 name mine
 x 11
-y 23
+y 25
 blocksview 0
 end
 arch dungeon_floor
 x 11
-y 24
+y 26
 end
 arch player_changer
 slaying /start/Nexus
 hp 12
 sp 12
 x 11
-y 24
+y 26
 arch ninja_class
 end
 end
 arch stonefloor2
 x 11
-y 25
-end
-arch mine_3_1
-name mine
-x 11
-y 25
-blocksview 0
-end
-arch dungeon_floor
-x 11
-y 26
-end
-arch player_changer
-slaying /start/Nexus
-hp 12
-sp 12
-x 11
-y 26
-arch thief_class
-end
-end
-arch stonefloor2
-x 11
 y 27
 end
 arch mine_3_1
@@ -3524,7 +3758,7 @@ hp 12
 sp 12
 x 11
 y 28
-arch monk_class
+arch dwarf_thief_class
 end
 end
 arch stonefloor2
@@ -3547,7 +3781,7 @@ hp 12
 sp 12
 x 11
 y 30
-arch paladin_class
+arch dwarf_monk_class
 end
 end
 arch stonefloor2
@@ -3570,18 +3804,41 @@ hp 12
 sp 12
 x 11
 y 32
-arch priest_class
+arch dwarf_paladin_class
+end
+end
+arch stonefloor2
+x 11
+y 33
+end
+arch mine_3_1
+name mine
+x 11
+y 33
+blocksview 0
+end
+arch dungeon_floor
+x 11
+y 34
+end
+arch player_changer
+slaying /start/Nexus
+hp 12
+sp 12
+x 11
+y 34
+arch dwarf_priest_class
 end
 end
 arch flagstone
 name floor
 face shop_empty.111
 x 11
-y 33
+y 35
 end
 arch mine_3_1
 x 11
-y 33
+y 35
 end
 arch earth
 x 12
@@ -3652,10 +3909,6 @@ arch mine13
 x 12
 y 15
 end
-arch swall_1_1_half
-x 12
-y 15
-end
 arch stonefloor2
 x 12
 y 16
@@ -3671,10 +3924,8 @@ x 12
 y 17
 end
 arch mine13
-name mine
 x 12
 y 17
-blocksview 0
 end
 arch swall_1_1_half
 x 12
@@ -3862,9 +4113,33 @@ face shop_empty.111
 x 12
 y 33
 end
+arch mine13
+name mine
+x 12
+y 33
+blocksview 0
+end
+arch swall_1_1_half
+x 12
+y 33
+end
+arch stonefloor2
+x 12
+y 34
+end
+arch swall_2_1_1
+x 12
+y 34
+end
+arch flagstone
+name floor
+face shop_empty.111
+x 12
+y 35
+end
 arch mine_3_1
 x 12
-y 33
+y 35
 end
 arch earth
 x 13
@@ -3943,180 +4218,182 @@ arch tile_white_floor
 x 13
 y 16
 end
-arch dwarf_warrior_class
+arch dwarf_giant_killer_class
 x 13
 y 16
 end
-arch stonefloor2
-x 13
-y 17
-end
-arch mine_3_1
-name mine
-x 13
-y 17
-blocksview 0
-end
-arch tile_white_floor
-x 13
-y 18
-end
-arch dwarf_barbarian_class
-x 13
-y 18
-end
-arch stonefloor2
-x 13
-y 19
-end
-arch mine_3_1
-name mine
-x 13
-y 19
-blocksview 0
-end
-arch tile_white_floor
-x 13
-y 20
-end
-arch ranger_class
-name ranger
-x 13
-y 20
-end
-arch stonefloor2
-x 13
-y 21
-end
-arch mine_3_1
-name mine
-x 13
-y 21
-blocksview 0
-end
-arch tile_white_floor
-x 13
-y 22
-end
-arch swashbuckler_class
-x 13
-y 22
-end
-arch stonefloor2
-x 13
-y 23
-end
-arch mine_3_1
-name mine
-x 13
-y 23
-blocksview 0
-end
-arch tile_white_floor
-x 13
-y 24
-end
-arch ninja_class
-x 13
-y 24
-end
-arch stonefloor2
-x 13
-y 25
-end
-arch mine_3_1
-name mine
-x 13
-y 25
-blocksview 0
-end
-arch tile_white_floor
-x 13
-y 26
-end
-arch thief_class
-face thief.151
-x 13
-y 26
-end
-arch stonefloor2
-x 13
-y 27
-end
-arch mine_3_1
-name mine
-x 13
-y 27
-blocksview 0
-end
-arch tile_white_floor
-x 13
-y 28
-end
-arch monk_class
-msg
-In the Monastery, they believed in
-mental discipline and peace through
-physical training, meditation, and to
-a lesser extent, religious devotion.
-Your mental equilibrium requires you
-to forego the use of weapons, but
-your physical training in karate
-means you're not helpless.  Your
-inner peacefulness grants you the
-ability to regenerate faster and to
-sense auras.
-endmsg
-x 13
-y 28
-end
-arch stonefloor2
-x 13
-y 29
-end
-arch mine_3_1
-name mine
-x 13
-y 29
-blocksview 0
-end
-arch tile_white_floor
-x 13
-y 30
-end
-arch paladin_class
-face paladin.151
-x 13
-y 30
-end
-arch stonefloor2
-x 13
-y 31
-end
-arch mine_3_1
-name mine
-x 13
-y 31
-blocksview 0
-end
-arch tile_white_floor
-x 13
-y 32
-end
-arch priest_class
-face priestnew.151
-x 13
-y 32
-end
 arch flagstone
 name floor
 face shop_empty.111
 x 13
+y 17
+end
+arch mine13
+x 13
+y 17
+end
+arch tile_white_floor
+x 13
+y 18
+end
+arch dwarf_warrior_class
+x 13
+y 18
+end
+arch stonefloor2
+x 13
+y 19
+end
+arch mine_3_1
+name mine
+x 13
+y 19
+blocksview 0
+end
+arch tile_white_floor
+x 13
+y 20
+end
+arch dwarf_barbarian_class
+x 13
+y 20
+end
+arch stonefloor2
+x 13
+y 21
+end
+arch mine_3_1
+name mine
+x 13
+y 21
+blocksview 0
+end
+arch tile_white_floor
+x 13
+y 22
+end
+arch ranger_class
+name ranger
+x 13
+y 22
+end
+arch stonefloor2
+x 13
+y 23
+end
+arch mine_3_1
+name mine
+x 13
+y 23
+blocksview 0
+end
+arch tile_white_floor
+x 13
+y 24
+end
+arch swashbuckler_class
+x 13
+y 24
+end
+arch stonefloor2
+x 13
+y 25
+end
+arch mine_3_1
+name mine
+x 13
+y 25
+blocksview 0
+end
+arch tile_white_floor
+x 13
+y 26
+end
+arch ninja_class
+x 13
+y 26
+end
+arch stonefloor2
+x 13
+y 27
+end
+arch mine_3_1
+name mine
+x 13
+y 27
+blocksview 0
+end
+arch tile_white_floor
+x 13
+y 28
+end
+arch dwarf_thief_class
+x 13
+y 28
+end
+arch stonefloor2
+x 13
+y 29
+end
+arch mine_3_1
+name mine
+x 13
+y 29
+blocksview 0
+end
+arch tile_white_floor
+x 13
+y 30
+end
+arch dwarf_monk_class
+x 13
+y 30
+end
+arch stonefloor2
+x 13
+y 31
+end
+arch mine_3_1
+name mine
+x 13
+y 31
+blocksview 0
+end
+arch tile_white_floor
+x 13
+y 32
+end
+arch dwarf_paladin_class
+x 13
+y 32
+end
+arch stonefloor2
+x 13
 y 33
 end
 arch mine_3_1
+name mine
 x 13
 y 33
+blocksview 0
+end
+arch tile_white_floor
+x 13
+y 34
+end
+arch dwarf_priest_class
+x 13
+y 34
+end
+arch flagstone
+name floor
+face shop_empty.111
+x 13
+y 35
+end
+arch mine_3_1
+x 13
+y 35
 end
 arch blocked
 x 14
@@ -4207,7 +4484,11 @@ face shop_empty.111
 x 14
 y 17
 end
-arch mine_3_3
+arch blocked
+x 14
+y 17
+end
+arch mine_ne
 x 14
 y 17
 end
@@ -4367,7 +4648,27 @@ face shop_empty.111
 x 14
 y 33
 end
-arch mine_se
+arch mine_3_3
 x 14
 y 33
 end
+arch flagstone
+name floor
+face shop_empty.111
+x 14
+y 34
+end
+arch mine_2_1_1
+x 14
+y 34
+end
+arch flagstone
+name floor
+face shop_empty.111
+x 14
+y 35
+end
+arch mine_se
+x 14
+y 35
+end