diff --git a/default.quests b/default.quests
index 99a32bfc2..babfb8338 100644
--- a/default.quests
+++ b/default.quests
@@ -146,3 +146,36 @@ I have collected my new armour from the smith.
 end_description
 end_step
 end_quest
+quest scorn/GorksTreasure
+title Gork's Treasure Hoard
+description
+Gain access to Gork's treasure
+end_description
+restart 1
+step 10
+description
+I have been told that there is a troll in town called Gork, who guards a large a stash of treasure. It may be worthwhile paying him a visit.
+end_description
+end_step
+step 20
+description
+I have spoken to a peaceful, but distinctly unpleasant troll called Gork, who is guarding a stash of treasure. Maybe if I continue to speak with him I can find a way to get access to his stash.
+end_description
+end_step
+step 30
+description
+Gork has indicated that his friend Mork can also open the treasure room. Maybe if I can find Mork he will be more agreeable than Gork is
+end_description
+end_step
+step 40
+description
+I have spoken to Mork, and he has given me the key to Mork's treasure room
+end_description
+end_step
+step 50
+finishes_quest
+description
+I have gained access to Gork's treasure room.
+end_description
+end_step
+end_quest
diff --git a/scorn/kar/gork.msg b/scorn/kar/gork.msg
index debd3c5af..6b61c7d5f 100644
--- a/scorn/kar/gork.msg
+++ b/scorn/kar/gork.msg
@@ -28,18 +28,23 @@
   "msg" : ["Mork live in tower.  Mork big, Mork friend."]
   }, {
   "match" : ["share","treasure"],
+  "pre" : [["quest", "scorn/GorksTreasure","30"]],
+  "post" : [["settoken", "gork_speak","key"]],
+  "msg" : ["Mork gave you key to open treasure door? Oh well, Gork assume Gork's friend knows what he is doing."]
+  }, {
+  "match" : ["share","treasure"],
   "pre" : [["token", "gork_speak","treasure"]],
-  "post" : [["settoken","gork_speak","key"],["settoken","can_get_key","1"]],
+  "post" : [["settoken", "gork_speak","key"],["quest", "scorn/GorksTreasure","20"]],
   "msg" : ["Only Gork and Mork can open treasure door."]
   }, {
   "match" : ["crush","door","open","treasure"],
-  "pre" : [["token","gork_speak","hoard","key"]],
-  "post" : [["settoken","gork_speak","pulp"]],
+  "pre" : [["token", "gork_speak","hoard","key"]],
+  "post" : [["settoken", "gork_speak","pulp"]],
   "msg" : ["Gurrr... Gork beat you to pulp!"]
   }, {
   "match" : ["*"],
   "pre" : [],
-  "post": [["settoken","gork_speak","*"]],
+  "post": [["settoken", "gork_speak","*"]],
   "msg" : ["Gork kill you!"]
   }
 ]}
diff --git a/scorn/kar/gork.quests b/scorn/kar/gork.quests
new file mode 100644
index 000000000..93322300e
--- /dev/null
+++ b/scorn/kar/gork.quests
@@ -0,0 +1,33 @@
+quest scorn/GorksTreasure
+title Gork's Treasure Hoard
+description
+Gain access to Gork's treasure
+end_description
+restart 1
+step 10
+description
+I have been told that there is a troll in town called Gork, who guards a large a stash of treasure. It may be worthwhile paying him a visit.
+end_description
+end_step
+step 20
+description
+I have spoken to a peaceful, but distinctly unpleasant troll called Gork, who is guarding a stash of treasure. Maybe if I continue to speak with him I can find a way to get access to his stash.
+end_description
+end_step
+step 30
+description
+Gork has indicated that his friend Mork can also open the treasure room. Maybe if I can find Mork he will be more agreeable than Gork is
+end_description
+end_step
+step 40
+description
+I have spoken to Mork, and he has given me the key to Mork's treasure room
+end_description
+end_step
+step 50
+finishes_quest
+description
+I have gained access to Gork's treasure room.
+end_description
+end_step
+end_quest
diff --git a/scorn/kar/gorks3 b/scorn/kar/gorks3
index 384bf3574..c324b6e46 100644
--- a/scorn/kar/gorks3
+++ b/scorn/kar/gorks3
@@ -7,7 +7,7 @@ height 14
 enter_x 6
 enter_y 6
 msg
-Modified: 2008-12-21 Rick Tanner
+Modified: 2010-03-26 Cavesomething
 endmsg
 end
 arch cobblestones2
@@ -282,6 +282,15 @@ arch dwall_1_2
 x 5
 y 7
 end
+arch check_floor
+x 5
+y 8
+arch event_trigger
+name scorn/GorksTreasure 40>50
+title Python
+slaying /python/dialog/QuestAdvance.py
+end
+end
 arch cobblestones2
 x 5
 y 8
@@ -579,16 +588,7 @@ y 8
 end
 arch troll
 msg
-@match [Hh]ello
-Youse want Gork's hoards?  I crush you...
-@match [Gg]ork|[Hh]oard*
-Gork not like you...  I not as nice as Mork.
-@match [Mm]ork
-Mork be Gork's friend.  Mork live in tower.
-@match [Ff]riend
-Mork share Gork's treasure.
-@match [Tt]reasure
-Only Gork can open treasure door.
+
 endmsg
 x 9
 y 8
diff --git a/scorn/kar/mork.msg b/scorn/kar/mork.msg
index 629b34101..af18093be 100644
--- a/scorn/kar/mork.msg
+++ b/scorn/kar/mork.msg
@@ -3,26 +3,29 @@
   "rules": [
   {
   "match" : ["gork"],
-  "pre" : [["token", "can_get_key","1"]],
+  "pre" : [["quest", "scorn/GorksTreasure", "20"]],
   "post" : [["settoken", "mork_speak","gork"]],
   "msg" : ["You know Gork?  You friend of Gork?"]
   }, {
   "match" : ["yes","friend"],
-  "pre" : [["token", "can_get_key","1"],["token", "mork_speak","gork"]],
+  "pre" : [["quest", "scorn/GorksTreasure", "20"],["token", "mork_speak","gork"]],
   "post" : [["settoken", "mork_speak","key"]],
   "msg" : ["I bet Gork send you to get key.  Did he?"]
   }, {
   "match" : ["key","send","yes"],
-  "pre" : [["token", "can_get_key","1"],["token", "mork_speak","key"]],
-  "post" : [["settoken", "mork_speak",""],["settoken", "can_get_key","0"],["connection", "9"]],
-  "msg" : ["Ok, I give you key.  Here, it in corner."],
-  "connected" : 9
+  "pre" : [["quest", "scorn/GorksTreasure", "30"], ["token", "mork_speak", "key"]],
+  "post" : [],
+  "msg" : ["I gave you key. Now you go."]
+  },{
+  "match" : ["key","send","yes"],
+  "pre" : [["quest", "scorn/GorksTreasure", "20"],["token", "mork_speak","key"]],
+  "post" : [["settoken", "mork_speak","0"],["quest", "scorn/GorksTreasure", "30"], ["giveitem", "gorks key"]],
+  "msg" : ["Ok, I give you key.  Here you go."]
   }, {
   "match" : ["hello","hi"],
   "pre" : [],
   "post" : [],
-  "msg" : ["Geesh, kill all my friends, that's not very nice.
-Where did you learn your manners?"]
+  "msg" : ["Geesh, kill all my friends, that's not very nice.\nWhere did you learn your manners?"]
   }, {
   "match" : ["friends"],
   "pre" : [],
@@ -32,8 +35,7 @@ Where did you learn your manners?"]
   "match" : ["pals"],
   "pre" : [],
   "post" : [],
-  "msg" : ["I'm tired of talking to you, you racist...
-GO AWAY!"]
+  "msg" : ["I'm tired of talking to you, you racist...\nGO AWAY!"]
   }, {
   "match" : ["*"],
   "pre" : [],
diff --git a/scorn/kar/somehouse3 b/scorn/kar/somehouse3
index 9d3d70b68..2f405ae39 100644
--- a/scorn/kar/somehouse3
+++ b/scorn/kar/somehouse3
@@ -8,7 +8,7 @@ enter_x 6
 enter_y 1
 msg
 Created:  1993-10-15
-Modified: 2008-11-15 Rick Tanner
+Modified: 2010-03-25 Cavesomething
 endmsg
 end
 arch dirtfloor
@@ -109,22 +109,10 @@ arch dirtfloor
 x 1
 y 1
 end
-arch key2
-name gorks key
-slaying mork
-x 1
-y 1
-end
 arch dirtfloor
 x 1
 y 2
 end
-arch gate_closed_1
-x 1
-y 2
-speed 0.500000
-connected 9
-end
 arch dirtfloor
 x 1
 y 3
@@ -213,18 +201,10 @@ arch dirtfloor
 x 2
 y 1
 end
-arch timberwall_2_1_1
-x 2
-y 1
-end
 arch dirtfloor
 x 2
 y 2
 end
-arch timberwall_1_2
-x 2
-y 2
-end
 arch dirtfloor
 x 2
 y 3
@@ -540,43 +520,12 @@ arch timberwall_1_3
 x 5
 y 8
 end
-arch magic_ear
-msg
-@match key
-You hear a well-oiled door open.
-endmsg
-x 5
-y 9
-connected 9
-arch event_say
-title Python
-slaying /python/misc/doNothing.py
-end
-end
 arch dirtfloor
 x 5
 y 9
 end
 arch giant
 name Mork
-msg
-@match [Hh]ello
-Geesh, kill all my friends, that's not very nice.
-Where did you learn your manners?
-@match friends
-They were just my pals.
-@match pals
-I'm tired of talking to you, you racist...
-GO AWAY!
-@match [Gg]ork
-You know Gork?  You friend of Gork?
-@match [Yy]es
-I bet Gork send you to get key.  Did he?
-@match [Ss]end
-Ok, I give you key.  Here, it in corner.
-@match *
-Leave me alone... <grumble>
-endmsg
 hp 1250
 maxhp 1250
 exp 1
@@ -593,6 +542,18 @@ name scorn/kar/mork.msg
 title Python
 slaying /python/dialog/npc_dialog.py
 end
+arch NPCGift
+arch key2
+name gorks key
+name_pl gorks keys
+slaying mork
+arch event_drop
+name scorn/GorksTreasure 50
+title Python
+slaying /python/dialog/QuestEssentialUntil.py
+end
+end
+end
 end
 arch dirtfloor
 x 5
@@ -1196,8 +1157,10 @@ x 11
 y 8
 end
 arch madman
+name Mindy
 x 11
 y 8
+type 0
 end
 arch dirtfloor
 x 11