diff --git a/azumauindo/misc/sage.msg b/azumauindo/misc/sage.msg
new file mode 100644
index 000000000..2902e290b
--- /dev/null
+++ b/azumauindo/misc/sage.msg
@@ -0,0 +1,16 @@
+{
+  "location" : "shrine1",
+  "rules": [
+  {
+  "match" : ["yes"],
+  "pre" : [],
+  "post" : [["quest", "quests/JadeChest", "10"]],
+  "msg" : ["In searching for information on the Jade Chest our informant in Navar seems to have found some valuable knowledge. The eastern wind gives you the duty to investigate this finding."]
+  },
+  {
+  "match" : ["*"],
+  "pre" : [],
+  "post" : [],
+  "msg" : ["There is much work to be done in unlocking the secrets of the Jade Chest. Azumauindo's interests lie within its grasp. Will you fulfill your duty?"]
+  }
+]}
diff --git a/azumauindo/misc/shrine1 b/azumauindo/misc/shrine1
index 744dc9d2d..f4b5ae633 100644
--- a/azumauindo/misc/shrine1
+++ b/azumauindo/misc/shrine1
@@ -9,7 +9,7 @@ enter_x 9
 enter_y 15
 msg
 Created:  2004-08-03 Mikeeusa
-Modified: 2021-10-02 Rick Tanner
+Modified: 2022-01-09 Kevin Zheng
 endmsg
 outdoor 1
 end
@@ -1208,6 +1208,9 @@ slaying castleb3jadekeyaza1
 x 9
 y 13
 connected 1
+arch quest_advance_trigger
+name quests/JadeChest 50>60
+end
 end
 arch woodfloor2
 name woodfloor
@@ -2000,24 +2003,20 @@ y 3
 end
 arch sage
 msg
-@match hi|hello
-There is much work to be done in unlocking the secrets of the Jade Chest. Azumauindo's interests lie within its grasp. Will you fulfill your duty?
-@match yes
-In searching for information on the Jade Chest our informant in Navar seems to have found some valuable knowledge. The eastern wind gives you the duty to investigate this finding.
+@match *
+I have a mission for you, but you will need to come back later.
 endmsg
 x 16
 y 3
+arch npc_dialog
+name /azumauindo/misc/sage.msg
+end
 end
 arch woodfloor2
 name woodfloor
 x 16
 y 4
 end
-arch marker
-slaying azaspyenterancenavar1
-x 16
-y 4
-end
 arch woodfloor2
 name woodfloor
 x 16
diff --git a/azumauindo/suno-yamatoshi/buildings/jadechesthouse1 b/azumauindo/suno-yamatoshi/buildings/jadechesthouse1
index 8cde21f90..247c7751f 100644
--- a/azumauindo/suno-yamatoshi/buildings/jadechesthouse1
+++ b/azumauindo/suno-yamatoshi/buildings/jadechesthouse1
@@ -9,7 +9,7 @@ enter_x 11
 enter_y 17
 msg
 Created:  2004-08-03 Mikeeusa
-Modified: 2012-01-24 Rick Tanner
+Modified: 2022-01-09 Kevin Zheng
 endmsg
 outdoor 1
 end
@@ -2671,6 +2671,9 @@ value 50000
 arch spell_icestorm
 level 30
 end
+arch quest_advance_pickup
+name quests/JadeChest 60>100
+end
 end
 end
 arch woodfloor2
diff --git a/navar_city/spyhouse b/navar_city/spyhouse
index bf541b80b..e4061fa11 100644
--- a/navar_city/spyhouse
+++ b/navar_city/spyhouse
@@ -9,7 +9,7 @@ enter_x 18
 enter_y 20
 msg
 Created:  2004-08-03 Mikeeusa
-Modified: 2021-07-21 Saiapatsu
+Modified: 2022-01-09 Kevin Zheng
 endmsg
 end
 arch cobblestones2
@@ -776,6 +776,9 @@ arch button_handle
 x 5
 y 12
 connected 1
+arch quest_advance_apply
+name quests/JadeChest 10>20
+end
 end
 arch woodfloor
 x 5
@@ -1051,6 +1054,9 @@ msg
 This key was taken from a Navarian who was suspected to "hold information pertaining to the Jade Chest" by a spy of Azumaindo.
 endmsg
 face key_blue.111
+arch quest_advance_pickup
+name quests/JadeChest 20>30
+end
 end
 end
 arch dungeon_floor
@@ -2869,10 +2875,13 @@ speed 0.500000
 connected 200
 end
 arch check_inv
-slaying azaspyenterancenavar1
 x 18
 y 16
-connected 200
+arch event_trigger
+name quests/JadeChest 10 200 1
+title Python
+slaying /python/quests/QuestTriggerConnect.py
+end
 end
 arch woodfloor
 x 18
@@ -2902,10 +2911,13 @@ speed 0.500000
 connected 2
 end
 arch check_inv
-slaying azumauindolvl0pass
 x 18
 y 19
-connected 2
+arch event_trigger
+name quests/Azumauindo 100 2 1
+title Python
+slaying /python/quests/QuestTriggerConnect.py
+end
 end
 arch woodfloor
 x 18
@@ -3055,10 +3067,13 @@ speed 0.500000
 connected 200
 end
 arch check_inv
-slaying azaspyenterancenavar1
 x 19
 y 16
-connected 200
+arch event_trigger
+name quests/JadeChest 10 200 1
+title Python
+slaying /python/quests/QuestTriggerConnect.py
+end
 end
 arch woodfloor
 x 19
@@ -3088,10 +3103,13 @@ speed 0.500000
 connected 2
 end
 arch check_inv
-slaying azumauindolvl0pass
 x 19
 y 19
-connected 2
+arch event_trigger
+name quests/Azumauindo 100 2 1
+title Python
+slaying /python/quests/QuestTriggerConnect.py
+end
 end
 arch woodfloor
 x 19
diff --git a/quests/quests.quests b/quests/quests.quests
index 6af8558bc..6a77dd879 100644
--- a/quests/quests.quests
+++ b/quests/quests.quests
@@ -146,3 +146,44 @@ I returned the Kabuto of Geisya to Azumauindo. The Shogun has granted me an audi
 end_description
 end_step
 end_quest
+quest quests/JadeChest
+title The Jade Chest
+description
+Find your way to the long-isolated island of Azumauindo.
+end_description
+step 10
+description
+The Eastern Wind asked me to get information about the Jade Chest from an informant in Navar.
+end_description
+end_step
+step 20
+description
+I need to "interrogate" the Navarians held in the Eastern Wind's spy house.
+end_description
+end_step
+step 30
+description
+I found a key to some keep in the antarctic.
+end_description
+end_step
+step 40
+description
+I found the Glacier Keep.
+end_description
+end_step
+step 50
+description
+I obtained the Jade Key.
+end_description
+end_step
+step 60
+description
+I opened the door to the room with the Jade Chest, but it is gone!
+end_description
+end_step
+step 100
+description
+I found the Jade Chest.
+end_description
+end_step
+end_quest
diff --git a/whalingoutpost/misc/castleb3 b/whalingoutpost/misc/castleb3
index b3a920f72..9f382a635 100644
--- a/whalingoutpost/misc/castleb3
+++ b/whalingoutpost/misc/castleb3
@@ -10,7 +10,7 @@ enter_x 57
 enter_y 40
 msg
 Created:  2004-08-03 Mikeeusa
-Modified: 2021-07-27 Saiapatsu
+Modified: 2022-01-09 Kevin Zheng
 endmsg
 end
 arch cave_15
@@ -15281,6 +15281,9 @@ x 56
 y 12
 materialname jade
 value 2000
+arch quest_advance_pickup
+name quests/JadeChest 40>50
+end
 end
 arch snow
 x 56
diff --git a/world/world_128_129 b/world/world_128_129
index 38193ce2f..b8c7e4c43 100644
--- a/world/world_128_129
+++ b/world/world_128_129
@@ -9,7 +9,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  2005-02-25
-Modified: 2008-10-30 Rick Tanner
+Modified: 2022-01-09 Kevin Zheng
 endmsg
 outdoor 1
 tile_path_1 world_128_128
@@ -9545,6 +9545,9 @@ hp 31
 sp 62
 x 35
 y 18
+arch quest_advance_apply
+name quests/JadeChest 30>40
+end
 end
 arch s_mountain
 x 35