diff --git a/QuestPaths/3.x - Heavensward/Class Quests/PLD/2032_An Exemplary Example.json b/QuestPaths/3.x - Heavensward/Class Quests/PLD/2032_An Exemplary Example.json
index ee824e805..8a2ba52dd 100644
--- a/QuestPaths/3.x - Heavensward/Class Quests/PLD/2032_An Exemplary Example.json	
+++ b/QuestPaths/3.x - Heavensward/Class Quests/PLD/2032_An Exemplary Example.json	
@@ -140,7 +140,8 @@
             "[Ul'dah] The Chamber of Rule",
             "[Ul'dah] Gate of Thal (Central Thanalan)"
           ],
-          "$": "nald and thal are approx. the same distance but coming from nald requires an extra walkto because it tries and fails to land on the ledge"
+          "$": "nald and thal are approx. the same distance but coming from nald requires an extra walkto because it tries and fails to land on the ledge",
+		  "NextQuestId": 2033
         }
       ]
     }
diff --git a/QuestPaths/3.x - Heavensward/Class Quests/PLD/2033_The Paladin Who Cried Wolf.json b/QuestPaths/3.x - Heavensward/Class Quests/PLD/2033_The Paladin Who Cried Wolf.json
index 8f4ed9773..ae7e89881 100644
--- a/QuestPaths/3.x - Heavensward/Class Quests/PLD/2033_The Paladin Who Cried Wolf.json	
+++ b/QuestPaths/3.x - Heavensward/Class Quests/PLD/2033_The Paladin Who Cried Wolf.json	
@@ -140,7 +140,8 @@
 					},
 					"TerritoryId": 397,
 					"InteractionType": "CompleteQuest",
-					"AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest"
+					"AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest",
+					"NextQuestId": 2034
 				}
 			]
 		}
diff --git a/QuestPaths/3.x - Heavensward/Class Quests/PLD/2034_Big Sollerets to Fill.json b/QuestPaths/3.x - Heavensward/Class Quests/PLD/2034_Big Sollerets to Fill.json
index 94a3ea81c..f0cde2845 100644
--- a/QuestPaths/3.x - Heavensward/Class Quests/PLD/2034_Big Sollerets to Fill.json	
+++ b/QuestPaths/3.x - Heavensward/Class Quests/PLD/2034_Big Sollerets to Fill.json	
@@ -185,7 +185,8 @@
 					},
 					"TerritoryId": 397,
 					"InteractionType": "CompleteQuest",
-					"AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest"
+					"AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest",
+					"NextQuestId": 2035
 				}
 			]
 		}
diff --git a/QuestPaths/3.x - Heavensward/Class Quests/PLD/2035_Hey Soul Crystal.json b/QuestPaths/3.x - Heavensward/Class Quests/PLD/2035_Hey Soul Crystal.json
index ea476c6a5..73280b59f 100644
--- a/QuestPaths/3.x - Heavensward/Class Quests/PLD/2035_Hey Soul Crystal.json	
+++ b/QuestPaths/3.x - Heavensward/Class Quests/PLD/2035_Hey Soul Crystal.json	
@@ -82,7 +82,8 @@
 					"AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest",
 					"SkipConditions": {
 						"AetheryteShortcutIf": { "InSameTerritory": true }
-					}
+					},
+					"NextQuestId": 2036
 				}
 			]
 		}
diff --git a/QuestPaths/3.x - Heavensward/Class Quests/PLD/2036_All According to Plan.json b/QuestPaths/3.x - Heavensward/Class Quests/PLD/2036_All According to Plan.json
new file mode 100644
index 000000000..3ba61eef6
--- /dev/null
+++ b/QuestPaths/3.x - Heavensward/Class Quests/PLD/2036_All According to Plan.json	
@@ -0,0 +1,173 @@
+{
+	"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+	"Author": "goatzone",
+	"QuestSequence": [
+		{
+			"Sequence": 0,
+			"Steps": [
+				{
+					"DataId": 1014068,
+					"Position": {
+						"X": 51.132935,
+						"Y": 124.95631,
+						"Z": 178.69836
+					},
+					"TerritoryId": 397,
+					"InteractionType": "AcceptQuest",
+					"Fly": true,
+					"AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest",
+					"SkipConditions": {
+						"AetheryteShortcutIf": { "InSameTerritory": true }
+					}
+				}
+			]
+		},
+		{
+			"Sequence": 1,
+			"Steps": [
+				{
+					"DataId": 1014069,
+					"Position": {
+						"X": 460.5935,
+						"Y": 200.23763,
+						"Z": 658.56396
+					},
+					"TerritoryId": 397,
+					"InteractionType": "Interact",
+					"Fly": true,
+					"AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest"
+				}
+			]
+		},
+		{
+			"Sequence": 2,
+			"Steps": [
+				{
+					"DataId": 1011233,
+					"Position": {
+						"X": 518.9136,
+						"Y": 217.95152,
+						"Z": 769.9243
+					},
+					"TerritoryId": 397,
+					"InteractionType": "Interact",
+					"Fly": true
+				}
+			]
+		},
+		{
+			"Sequence": 3,
+			"Steps": [
+				{
+					"DataId": 1014073,
+					"Position": {
+						"X": -693.8125,
+						"Y": -109.83532,
+						"Z": 490.95898
+					},
+					"TerritoryId": 401,
+					"InteractionType": "Interact",
+					"Fly": true,
+					"AetheryteShortcut": "The Sea of Clouds - Camp Cloudtop"
+				}
+			]
+		},
+		{
+			"Sequence": 4,
+			"Steps": [
+				{
+					"DataId": 1014075,
+					"Position": {
+						"X": -272.17517,
+						"Y": -184.2003,
+						"Z": 736.0493
+					},
+					"TerritoryId": 401,
+					"InteractionType": "Interact",
+					"Fly": true
+				}
+			]
+		},
+		{
+			"Sequence": 5,
+			"Steps": [
+				{
+					"Position": {
+						"X": -43.012157,
+						"Y": -176.80112,
+						"Z": 753.7885
+					},
+					"TerritoryId": 401,
+					"InteractionType": "Combat",
+					"Fly": true,
+					"EnemySpawnType": "AutoOnEnterArea",
+					"KillEnemyDataIds": [5048, 5049]
+				}
+			]
+		},
+		{
+			"Sequence": 6,
+			"Steps": [
+				{
+					"Position": {
+						"X": 207.48586,
+						"Y": -176.39336,
+						"Z": 721.5167
+					},
+					"TerritoryId": 401,
+					"InteractionType": "Combat",
+					"Fly": true,
+					"EnemySpawnType": "AutoOnEnterArea",
+					"KillEnemyDataIds": [4687, 4688]
+				}
+			]
+		},
+		{
+			"Sequence": 7,
+			"Steps": [
+				{
+					"DataId": 1014088,
+					"Position": {
+						"X": 200.42712,
+						"Y": -176.62952,
+						"Z": 737.0565
+					},
+					"TerritoryId": 401,
+					"InteractionType": "Interact"
+				}
+			]
+		},
+		{
+			"Sequence": 8,
+			"Steps": [
+				{
+					"DataId": 1014089,
+					"Position": {
+						"X": 205.98145,
+						"Y": -176.69763,
+						"Z": 739.52844
+					},
+					"TerritoryId": 401,
+					"InteractionType": "Interact"
+				}
+			]
+		},
+		{
+			"Sequence": 255,
+			"Steps": [
+				{
+					"DataId": 1015055,
+					"Position": {
+						"X": 509.17822,
+						"Y": 212.5399,
+						"Z": 695.796
+					},
+					"TerritoryId": 397,
+					"InteractionType": "CompleteQuest",
+                    "AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest",
+                    "NextQuestId": 2037
+				}
+			]
+		}
+	]
+}