diff --git a/navar_city/city1church1 b/navar_city/city1church1
index d70f40eee..0b856d10f 100644
--- a/navar_city/city1church1
+++ b/navar_city/city1church1
@@ -8,7 +8,7 @@ enter_x 14
 enter_y 33
 msg
 Created:  1993-11-10 Cater & Wade (john_cater@yahoo.com)
-Modified: 2012-02-14 Rick Tanner
+Modified: 2012-05-12 Nicolas Weeger
 endmsg
 outdoor 1
 end
@@ -2137,6 +2137,25 @@ arch flagstone
 x 9
 y 8
 end
+arch dwarf_priest
+msg
+@match smugglers
+Then I can help you....the smugglers are headquartered in one of the warehouses.  Which one I do not know, but it may lead to their enterance to the city.  Here is the key to their front door.
+@match *
+Are you here about the smugglers??
+endmsg
+x 9
+y 8
+arch NPCGift
+arch brown_key
+name Key to a Navar warehouse
+slaying navar_smuggle
+end
+end
+arch npc_dialog
+name /navar_city/mostrai_priest.msg
+end
+end
 arch flagstone
 x 9
 y 9
@@ -2375,27 +2394,10 @@ arch flagstone
 x 10
 y 8
 end
-arch dwarf_priest
-msg
-@match smugglers
-Then I can help you....the smugglers are headquartered in one of the warehouses.  Which one I do not know, but it may lead to their enterance to the city.  Here is the key to their front door.
-@match *
-Are you here about the smugglers??
-endmsg
-x 10
-y 8
-end
 arch flagstone
 x 10
 y 9
 end
-arch key2
-name A Key to a Door
-slaying set_individual_value smuggle
-face key_brown.111
-x 10
-y 9
-end
 arch flagstone
 x 10
 y 10
@@ -4444,28 +4446,15 @@ arch flagstone
 x 19
 y 7
 end
-arch flagstone
-x 19
-y 8
-end
-arch dwarf_priest
-msg
-@match smugglers
-Then I can help you....the smugglers are headquartered in one of the warehouses.  Which one I do not know, but it may lead to their enterance to the city.  Here is a key to their front door
-@match *
-Are you here about the smugglers??
-endmsg
+arch light4
 x 19
 y 8
 end
 arch flagstone
 x 19
-y 9
+y 8
 end
-arch key2
-name A Key to a Door
-slaying set_individual_value smuggle
-face key_brown.111
+arch flagstone
 x 19
 y 9
 end
@@ -4696,6 +4685,25 @@ arch flagstone
 x 20
 y 8
 end
+arch dwarf_priest
+msg
+@match smugglers
+Then I can help you....the smugglers are headquartered in one of the warehouses.  Which one I do not know, but it may lead to their enterance to the city.  Here is the key to their front door.
+@match *
+Are you here about the smugglers??
+endmsg
+x 20
+y 8
+arch NPCGift
+arch brown_key
+name Key to a Navar warehouse
+slaying navar_smuggle
+end
+end
+arch npc_dialog
+name /navar_city/mostrai_priest.msg
+end
+end
 arch flagstone
 x 20
 y 9
diff --git a/navar_city/city1court b/navar_city/city1court
index 7c56d3e17..1adbc02b5 100644
--- a/navar_city/city1court
+++ b/navar_city/city1court
@@ -8,7 +8,7 @@ enter_x 10
 enter_y 16
 msg
 Created:  1993-11-01 (john_cater@yahoo.com)
-Modified: 2012-04-22 Nicolas Weeger
+Modified: 2012-05-12 Nicolas Weeger
 endmsg
 end
 arch cobblestones2
@@ -1631,22 +1631,6 @@ arch cobblestones2
 x 14
 y 8
 end
-arch magic_ear
-msg
-@match quest
-So you are the ones who think they can get rid of these smugglers...well we have tried and they keep coming back.  Well you might want to talk to the Dwarven priests in the church, they do know something that they won't tell us, something about being worthy.
-@match smugglers
-What a vile bunch they are those smugglers, with many allies.
-@match allies
-Aye, some say they are in league with Devils.
-@match priests
-Well if ya want ta know about them...go ask them yourself.
-@match *
-I'm Staff Sgt. MacDonald, what can I do for ya.
-endmsg
-x 14
-y 9
-end
 arch cobblestones2
 x 14
 y 9
@@ -2231,6 +2215,20 @@ arch chair_3.2
 x 19
 y 5
 end
+arch fighter
+name Lt. Piltro
+x 19
+y 5
+direction 6
+arch npc_dialog
+name /navar_city/piltro.msg
+end
+arch NPCGift
+arch amethyst
+nrof 10
+end
+end
+end
 arch cobblestones2
 x 19
 y 6
diff --git a/navar_city/light/light0 b/navar_city/light/light0
index 929daafaf..468761281 100644
--- a/navar_city/light/light0
+++ b/navar_city/light/light0
@@ -9,7 +9,7 @@ enter_x 13
 enter_y 9
 msg
 Created:  1993-11-12
-Modified: 2008-10-25 Rick Tanner
+Modified: 2012-05-12 Nicolas Weeger
 endmsg
 end
 arch large_stones
@@ -1838,6 +1838,9 @@ hp 1
 sp 9
 x 7
 y 23
+arch quest_advance_trigger
+name navar/smugglers 40>50
+end
 end
 arch large_stones
 x 7
diff --git a/navar_city/light/light1 b/navar_city/light/light1
index af1a1b01c..b87761a71 100644
--- a/navar_city/light/light1
+++ b/navar_city/light/light1
@@ -9,7 +9,7 @@ enter_x 17
 enter_y 4
 msg
 Created:  1993-11-12
-Modified: 2012-02-15 Rick Tanner
+Modified: 2012-05-12 Nicolas Weeger
 endmsg
 end
 arch cobblestones2
@@ -478,7 +478,7 @@ x 3
 y 3
 end
 arch locked_door2
-slaying set_individual_value lightkey
+slaying navar_lightkey
 msg
 You do not have the key to open this door.
 endmsg
diff --git a/navar_city/light/smugship1 b/navar_city/light/smugship1
index 19d18de81..079793e80 100644
--- a/navar_city/light/smugship1
+++ b/navar_city/light/smugship1
@@ -8,7 +8,7 @@ enter_x 10
 enter_y 2
 msg
 Created:  1993-11-17
-Modified: 2008-09-20 Rick Tanner
+Modified: 2012-05-12 Nicolas Weeger
 endmsg
 end
 arch woodfloor
@@ -3059,12 +3059,16 @@ ac -7
 x 22
 y 21
 carrying 2500
+no_mood_change 1
 arch girdle_str
 end
 arch spell_mass_confusion
 end
 arch spell_icestorm
 end
+arch quest_advance_death
+name navar/smugglers 50>60
+end
 end
 arch woodfloor
 name deck
diff --git a/navar_city/misc/city1mermaid b/navar_city/misc/city1mermaid
index 91fa0ad8e..ef5762914 100644
--- a/navar_city/misc/city1mermaid
+++ b/navar_city/misc/city1mermaid
@@ -8,7 +8,7 @@ enter_x 13
 enter_y 13
 msg
 Created:  1993-10-27
-Modified: 2012-05-07 Nicolas Weeger
+Modified: 2012-05-12 Nicolas Weeger
 endmsg
 outdoor 1
 end
@@ -2429,8 +2429,8 @@ y 3
 carrying 100
 unaggressive 1
 arch key2
-name A Key
-slaying set_individual_value smugdoor
+name stained key
+slaying navar_smugdoor
 end
 end
 arch woodfloor
diff --git a/navar_city/mostrai_priest.msg b/navar_city/mostrai_priest.msg
new file mode 100644
index 000000000..7a0e0acc5
--- /dev/null
+++ b/navar_city/mostrai_priest.msg
@@ -0,0 +1,30 @@
+{
+  "rules": [
+  {
+  "match" : ["*"],
+  "pre" : [["npctoken", "given", "1"]],
+  "post" : [],
+  "msg" : ["Hello."]
+  }, {
+  "match" : ["yes"],
+  "pre" : [["quest", "navar/smugglers", "=10"]],
+  "post" : [["quest", "navar/smugglers", "20"], ["givecontents", "NPC_Gift_Box"], ["setnpctoken", "given", "1"]],
+  "msg" : ["Then I can help you....the smugglers are headquartered in one of the warehouses.  Which one I do not know, but it may lead to their entrance to the city.  Here is the key to their front door."]
+  }, {
+  "match" : ["yes"],
+  "pre" : [],
+  "post" : [["givecontents", "NPC_Gift_Box"], ["setnpctoken", "given", "1"]],
+  "msg" : ["Then I can help you....the smugglers are headquartered in one of the warehouses.  Which one I do not know, but it may lead to their entrance to the city.  Here is the key to their front door."]
+  }, {
+  "match" : ["no"],
+  "pre" : [],
+  "post" : [],
+  "msg" : ["Oh, ok."]
+  }, {
+  "match" : ["*"],
+  "pre" : [],
+  "post" : [],
+  "msg" : ["Are you here about the smugglers?"],
+  "replies" : [["yes", "Yes.", "1"], ["no", "No, not at all.", "1"]]
+  }
+]}
diff --git a/navar_city/navar_city.quests b/navar_city/navar_city.quests
index 69ad0d5d1..b41a7fd4e 100644
--- a/navar_city/navar_city.quests
+++ b/navar_city/navar_city.quests
@@ -90,3 +90,47 @@ end_description
 end_step
 end_quest
 
+quest navar/smugglers
+title Navar's smugglers
+face northman.111
+description
+I've been tasked to fight Navar's smugglers.
+end_description
+step 10
+description
+According to Lt. Piltro, I should talk to the Dwarven priests in Mostrai's cathedral.
+end_description
+end_step
+step 20
+description
+I have the key to one of the warehouses which the smugglers use.
+end_description
+end_step
+step 30
+description
+I found another key, and should try to figure which warehouse it corresponds to.
+end_description
+end_step
+step 40
+description
+According to the man I rescued, the entrance is in the lighthouse, I need to go to the top and then down.
+end_description
+end_step
+step 50
+description
+I have found the smuggler's ship, I should find and kill their boss.
+end_description
+end_step
+step 60
+description
+I have killed the smuggler's boss, I should go talk to Lt. Piltro.
+end_description
+end_step
+step 70
+finishes_quest
+description
+Lt. Piltro gave me a reward.
+end_description
+end_step
+end_quest
+
diff --git a/navar_city/piltro.msg b/navar_city/piltro.msg
new file mode 100644
index 000000000..f9541670e
--- /dev/null
+++ b/navar_city/piltro.msg
@@ -0,0 +1,53 @@
+{
+  "location" : "navar",
+  "rules": [
+  {
+  "match" : ["*"],
+  "pre" : [["quest", "navar/smugglers", "=70"]],
+  "post" : [],
+  "msg" : ["Hello $you."]
+  }, {
+  "match" : ["yes"],
+  "pre" : [["quest", "navar/smugglers", "=60"]],
+  "post" : [["quest", "navar/smugglers", "70"], ["givecontents", "NPC_Gift_Box"]],
+  "msg" : ["Thank you very much!\n\nHere, take that as a token of gratitude from Navar."]
+  }, {
+  "match" : ["*"],
+  "pre" : [["quest", "navar/smugglers", "=60"]],
+  "post" : [],
+  "msg" : ["So, did you make any progress in fighting the smugglers?"],
+  "replies" : [["yes", "Yes, I killed the chief, so it should be quieter from now on.", "0"]]
+  }, {
+  "match" : ["*"],
+  "pre" : [["quest", "navar/smugglers", "10-50"]],
+  "post" : [],
+  "msg" : ["So, did you make any progress in fighting the smugglers?"]
+  }, {
+  "match" : ["yes"],
+  "pre" : [["quest", "navar/rescue-daughters", "=60"]],
+  "post" : [["quest", "navar/smugglers", "10"]],
+  "msg" : ["Thank you very much. You might want to talk to the Dwarven priests in the church, they do know something that they won't tell us, something about being worthy."]
+  }, {
+  "match" : ["no"],
+  "pre" : [["quest", "navar/rescue-daughters", "=60"]],
+  "post" : [],
+  "msg" : ["Ha well, it was worth asking..."]
+  }, {
+  "match" : ["how"],
+  "pre" : [["quest", "navar/rescue-daughters", "=60"]],
+  "post" : [],
+  "msg" : ["We have tried fighting them, and they keep coming back. Will you help us?"],
+  "replies" : [["yes", "Ok, I guess I can help. Any hint?", "1"], ["no", "No, sorry, I'm busy too.", "0"]]
+  }, {
+  "match" : ["*"],
+  "pre" : [["quest", "navar/rescue-daughters", "=60"]],
+  "post" : [],
+  "msg" : ["Hello. So you're the one who rescued Ben's daughters, hm?\n\nMaybe you could help me with the smugglers?"],
+  "replies" : [["how", "How could I help?", "2"]]
+  }, {
+  "match" : ["*"],
+  "pre" : [],
+  "post" : [],
+  "msg" : ["Hello, how can I help you?"]
+  }
+]}
diff --git a/navar_city/warehouse3 b/navar_city/warehouse3
index 19d8ad67f..d7aa81352 100644
--- a/navar_city/warehouse3
+++ b/navar_city/warehouse3
@@ -8,7 +8,7 @@ enter_x 2
 enter_y 34
 msg
 Created:  1993-11-10
-Modified: 2012-02-14 Rick Tanner
+Modified: 2012-05-12 Nicolas Weeger
 endmsg
 end
 arch woodfloor
@@ -641,7 +641,7 @@ x 2
 y 32
 end
 arch locked_door1
-slaying set_individual_value smuggle
+slaying navar_smuggle
 face ldoor_brown1.111
 x 2
 y 32
@@ -1567,8 +1567,12 @@ level 6
 carrying 65600
 arch key2
 name Key
-slaying set_individual_value ware
+slaying navar_ware
 face key_brown.111
+arch quest_advance_pickup
+name navar/smugglers 20>30
+unique 1
+end
 end
 arch sword_4
 end
@@ -3830,9 +3834,9 @@ y 9
 end
 arch locked_door1
 name wall
-slaying set_individual_value smugdoor
+slaying navar_smugdoor
 msg
-This wall sounds hollow, but you cannot get in, but there is a keyhole.
+This wall sounds hollow, but you cannot get in. There is a stained keyhole.
 endmsg
 face wwall_A.111
 x 17
diff --git a/navar_city/warehouse4 b/navar_city/warehouse4
index 706cac426..38a41a5f6 100644
--- a/navar_city/warehouse4
+++ b/navar_city/warehouse4
@@ -8,7 +8,7 @@ enter_x 27
 enter_y 15
 msg
 Created:  1993-11-12
-Modified: 2012-05-06 Nicolas Weeger
+Modified: 2012-05-12 Nicolas Weeger
 endmsg
 end
 arch woodfloor
@@ -172,7 +172,7 @@ x 1
 y 11
 end
 arch locked_door1
-slaying set_individual_value ware
+slaying navar_ware
 msg
 For some reason this door is locked.
 endmsg
@@ -189,13 +189,6 @@ arch woodfloor
 x 1
 y 13
 end
-arch key2
-name Lighthouse Key
-slaying set_individual_value lightkey
-face key_blue.111
-x 1
-y 13
-end
 arch woodfloor
 x 1
 y 14
@@ -212,6 +205,15 @@ endmsg
 x 1
 y 14
 stand_still 1
+arch NPCGift
+arch blue_key
+name Navar lighthouse key
+slaying navar_lightkey
+end
+end
+arch npc_dialog
+name /navar_city/warehouse4.msg
+end
 end
 arch woodfloor
 x 1
diff --git a/navar_city/warehouse4.msg b/navar_city/warehouse4.msg
new file mode 100644
index 000000000..1cf056cfc
--- /dev/null
+++ b/navar_city/warehouse4.msg
@@ -0,0 +1,29 @@
+{
+  "rules": [
+  {
+  "match" : ["entrance"],
+  "pre" : [["npctoken", "given", "1"]],
+  "post" : [],
+  "msg" : ["Yes, the entrance, it is in the lower levels of the Lighthouse, but you have to get to the top level to go down to it."]
+  }, {
+  "match" : ["entrance"],
+  "pre" : [["quest", "navar/smugglers", "=30"]],
+  "post" : [["quest", "navar/smugglers", "40"], ["givecontents", "NPC_Gift_Box"], ["setnpctoken", "given", "1"]],
+  "msg" : ["Yes, the entrance, it is in the lower levels of the Lighthouse, but you have to get to the top level to go down to it. Here is the key to the lighthouse."]
+  }, {
+  "match" : ["entrance"],
+  "pre" : [],
+  "post" : [["givecontents", "NPC_Gift_Box"], ["setnpctoken", "given", "1"]],
+  "msg" : ["Yes, the entrance, it is in the lower levels of the Lighthouse, but you have to get to the top level to go down to it. Here is the key to the lighthouse."]
+  }, {
+  "match" : ["smugglers"],
+  "pre" : [],
+  "post" : [],
+  "msg" : ["Yes, the smugglers, they locked me in here to die of starvation since I overheard where their secret entrance to the city is."]
+  }, {
+  "match" : ["*"],
+  "pre" : [],
+  "post" : [],
+  "msg" : ["Praise Valriel you have come to let me out... those damned smugglers."]
+  }
+]}