diff --git a/scorn/misc/castle b/scorn/misc/castle
index d3dc364f1..a82f02584 100644
--- a/scorn/misc/castle
+++ b/scorn/misc/castle
@@ -8,7 +8,7 @@ enter_x 11
 enter_y 20
 msg
 Created:  1997-04-27
-Modified: 2008-10-25 Rick Tanner
+Modified: 2010-05-04 Cavesomething
 endmsg
 maplore
 @quest Lursendis
@@ -1627,12 +1627,6 @@ end
 arch guildmaster
 name Magistrate
 msg
-@match farnass
-Ha, the cook? You can find him in the kitchen, near the castle.
-
-The kitchen password is 'clickety'.
-@match *
-I'm too busy to help you.
 endmsg
 x 11
 y 5
@@ -1677,76 +1671,63 @@ arch cobblestones2
 x 11
 y 15
 end
-arch check_inv
-slaying Noble Rank Prince
+arch check_floor
+hp 1
 x 11
 y 15
-connected 25
-move_off 0
+arch event_trigger
+name scorn/Aristocracy 90 25
+title Python
+slaying python/quests/QuestTriggerConnect.py
 end
-arch check_inv
-slaying Noble Rank Marquis
-x 11
-y 15
-connected 23
-move_off 0
 end
-arch check_inv
-slaying Noble Rank Earl
+arch check_floor
+hp 1
 x 11
 y 15
-connected 23
-move_off 0
+arch event_trigger
+name scorn/Aristocracy 40-80 23
+title Python
+slaying python/quests/QuestTriggerConnect.py
 end
-arch check_inv
-slaying Noble Rank Count
-x 11
-y 15
-connected 23
-move_off 0
-end
-arch check_inv
-slaying Noble Rank Duke
-x 11
-y 15
-connected 23
-move_off 0
-end
-arch check_inv
-slaying Noble Rank Archduke
-x 11
-y 15
-connected 23
-move_off 0
 end
 arch cobblestones2
 x 11
 y 16
 end
-arch check_inv
-slaying Noble Rank Baron
+arch check_floor
+hp 1
 x 11
 y 16
-connected 22
-move_off 0
+arch event_trigger
+name scorn/Aristocracy 30 22
+title Python
+slaying python/quests/QuestTriggerConnect.py
+end
 end
 arch cobblestones2
 x 11
 y 17
 end
-arch check_inv
-slaying Noble Rank Baronet
+arch check_floor
+hp 1
 x 11
 y 17
-connected 21
-move_off 0
+arch event_trigger
+name scorn/Aristocracy 20 21
+title Python
+slaying python/quests/QuestTriggerConnect.py
 end
-arch check_inv
-slaying Noble Rank Knight
+end
+arch check_floor
+hp 1
 x 11
 y 17
-connected 20
-move_off 0
+arch event_trigger
+name scorn/Aristocracy 10 20
+title Python
+slaying python/quests/QuestTriggerConnect.py
+end
 end
 arch cobblestones2
 x 11
@@ -1823,8 +1804,78 @@ y 5
 end
 arch guildmaster
 name Magistrate
+msg
+endmsg
 x 12
 y 5
+arch NPCGift
+arch carton_box_1
+name Count Reward
+arch marker
+name Noble Rank Earl
+slaying Noble Rank Count
+food 0
+end
+arch firebrand
+end
+end
+arch carton_box_1
+name Earl Reward
+arch marker
+name Noble Rank Marquis
+slaying Noble Rank Earl
+food 0
+end
+arch dragon_shield
+end
+end
+arch carton_box_1
+name Marquis Reward
+arch marker
+name Noble Rank Baron
+slaying Noble Rank Marquis
+food 0
+end
+arch potion_improve
+end
+end
+arch carton_box_1
+name Baron Reward
+arch marker
+name Noble Rank Baronet
+slaying Noble Rank Baron
+food 0
+end
+arch elven_bow
+end
+end
+arch carton_box_1
+name Baronet Reward
+arch marker
+name Noble Rank Knight
+slaying Noble Rank Baronet
+food 0
+end
+arch girdle_dam
+end
+end
+arch carton_box_1
+name Knight Reward
+arch marker
+slaying hero_of_scorn
+food 0
+end
+arch marker
+slaying Noble Rank Knight
+food 0
+end
+end
+end
+arch event_say
+name scorn/misc/magistrate.msg
+title Python
+slaying /python/dialog/npc_dialog.py
+end
 end
 arch cobblestones2
 x 12
@@ -1866,76 +1917,63 @@ arch cobblestones2
 x 12
 y 15
 end
-arch check_inv
-slaying Noble Rank Prince
+arch check_floor
+hp 1
 x 12
 y 15
-connected 25
-move_off 0
+arch event_trigger
+name scorn/Aristocracy 90 25
+title Python
+slaying python/quests/QuestTriggerConnect.py
 end
-arch check_inv
-slaying Noble Rank Marquis
-x 12
-y 15
-connected 23
-move_off 0
 end
-arch check_inv
-slaying Noble Rank Earl
+arch check_floor
+hp 1
 x 12
 y 15
-connected 23
-move_off 0
+arch event_trigger
+name scorn/Aristocracy 40-80 23
+title Python
+slaying python/quests/QuestTriggerConnect.py
 end
-arch check_inv
-slaying Noble Rank Count
-x 12
-y 15
-connected 23
-move_off 0
-end
-arch check_inv
-slaying Noble Rank Duke
-x 12
-y 15
-connected 23
-move_off 0
-end
-arch check_inv
-slaying Noble Rank Archduke
-x 12
-y 15
-connected 23
-move_off 0
 end
 arch cobblestones2
 x 12
 y 16
 end
-arch check_inv
-slaying Noble Rank Baron
+arch check_floor
+hp 1
 x 12
 y 16
-connected 22
-move_off 0
+arch event_trigger
+name scorn/Aristocracy 30 22
+title Python
+slaying python/quests/QuestTriggerConnect.py
+end
 end
 arch cobblestones2
 x 12
 y 17
 end
-arch check_inv
-slaying Noble Rank Baronet
+arch check_floor
+hp 1
 x 12
 y 17
-connected 21
-move_off 0
+arch event_trigger
+name scorn/Aristocracy 10 20
+title Python
+slaying python/quests/QuestTriggerConnect.py
 end
-arch check_inv
-slaying Noble Rank Knight
+end
+arch check_floor
+hp 1
 x 12
 y 17
-connected 20
-move_off 0
+arch event_trigger
+name scorn/Aristocracy 20 21
+title Python
+slaying python/quests/QuestTriggerConnect.py
+end
 end
 arch cobblestones2
 x 12