diff --git a/class/Aron; Demi-Dragon.json b/class/Aron; Demi-Dragon.json
index c29c24f580..f73e018414 100644
--- a/class/Aron; Demi-Dragon.json	
+++ b/class/Aron; Demi-Dragon.json	
@@ -10,22 +10,20 @@
 					"Aron"
 				],
 				"convertedBy": [
-					"Aron",
-					"Zar Shef"
+					"Aron"
 				],
-				"version": "4.6",
+				"version": "4.7",
 				"url": "https://www.gmbinder.com/share/-LpZX_fRKhLCn-mr_64B",
 				"targetSchema": "1.0.0",
 				"color": "e34234"
 			}
 		],
 		"dateAdded": 1661716025,
-		"dateLastModified": 1692309855,
+		"dateLastModified": 1693957377,
 		"optionalFeatureTypes": {
 			"MV:J": "Maneuver, Juggernaut",
 			"Morph": "Morph Category, Metamorph"
-		},
-		"_dateLastModifiedHash": "776db1a3a1"
+		}
 	},
 	"race": [
 		{
@@ -222,7 +220,7 @@
 					},
 					{
 						"a": [
-							"dungeoneer's pack|phb"
+							"scholar's pack|phb"
 						],
 						"b": [
 							"priest's pack|phb"
@@ -1535,6 +1533,33 @@
 			"shortName": "Skyterror",
 			"className": "Demi-Dragon",
 			"classSource": "TheDemiDragon"
+		},
+		{
+			"name": "Embodiment of the Packlord",
+			"subclassFeatures": [
+				"Embodiment of the Packlord|Demi-Dragon|TheDemiDragon|Packlord|TheDemiDragon|3",
+				"Raucous Pack|Demi-Dragon|TheDemiDragon|Packlord|TheDemiDragon|6",
+				"Packbearer|Demi-Dragon|TheDemiDragon|Packlord|TheDemiDragon|10",
+				"Pack Morale|Demi-Dragon|TheDemiDragon|Packlord|TheDemiDragon|17"
+			],
+			"source": "TheDemiDragon",
+			"shortName": "Packlord",
+			"className": "Demi-Dragon",
+			"classSource": "TheDemiDragon"
+		},
+		{
+			"name": "Embodiment of the Echo",
+			"subclassFeatures": [
+				"Embodiment of the Echo|Demi-Dragon|TheDemiDragon|Echo|TheDemiDragon|3",
+				"Essence in Flux|Demi-Dragon|TheDemiDragon|Echo|TheDemiDragon|6",
+				"Distant Insight|Demi-Dragon|TheDemiDragon|Echo|TheDemiDragon|6",
+				"Twinned Echo|Demi-Dragon|TheDemiDragon|Echo|TheDemiDragon|10",
+				"Devour Fate|Demi-Dragon|TheDemiDragon|Echo|TheDemiDragon|17"
+			],
+			"source": "TheDemiDragon",
+			"shortName": "Echo",
+			"className": "Demi-Dragon",
+			"classSource": "TheDemiDragon"
 		}
 	],
 	"subclassFeature": [
@@ -1593,7 +1618,7 @@
 							"type": "entries",
 							"name": "Fury",
 							"entries": [
-								"You have four fury points. You regain all of your expended fury points when you finish a short or long rest.",
+								"You have five fury points. You regain all of your expended fury points when you finish a short or long rest.",
 								"You can spend fury to perform a maneuver. Each maneuver costs fury points to use, noted in parentheses. You must be able to pay the fury cost to use the maneuver.",
 								"You gain two more fury points at levels 6th, 10th, and 17th."
 							]
@@ -1689,6 +1714,10 @@
 							"type": "refOptionalfeature",
 							"optionalfeature": "Fearsome Wound (2)|TheDemiDragon"
 						},
+						{
+							"type": "refOptionalfeature",
+							"optionalfeature": "Mighty Toss (2)|TheDemiDragon"
+						},
 						{
 							"type": "refOptionalfeature",
 							"optionalfeature": "Reprisal (2)|TheDemiDragon"
@@ -1772,7 +1801,7 @@
 			"level": 17,
 			"header": 2,
 			"entries": [
-				"Combat is the anvil of will, and you are its hammer. Starting from 17th level, when a creature succeeds on a saving throw against one of your demi-dragon class features, you can force it to reroll. It must use the new roll. Once you use this feature, you can't do so again until you finish a long rest."
+				"Combat is the anvil of will, and you are its hammer. Starting from 17th level, when a creature succeeds on a saving throw against one of your demi-dragon class features, you can force it to reroll. It must use the new roll. Once you use this feature, you can't do so again until you finish a short or long rest."
 			]
 		},
 		{
@@ -1805,7 +1834,7 @@
 			"level": 3,
 			"header": 1,
 			"entries": [
-				"Starting from 3rd level, your psionic mind lets you manipulate those who surround you, or protect yourself from attackers. As a bonus action, you gain one of the following benefits which lasts until you choose the other option:",
+				"Starting from 3rd level, your psionic mind lets you manipulate those who surround you, or protect yourself from attackers. At the start of your turn, you gain one of the following benefits which lasts until you choose the other option:",
 				{
 					"type": "options",
 					"entries": [
@@ -1820,7 +1849,7 @@
 							"type": "entries",
 							"name": "Bolstering Backlash",
 							"entries": [
-								"As a reaction when a creature forces you to make a saving throw, you can choose to lash out at the offender with your mind. The creature takes {@damage 1d4} psychic damage. You gain a bonus to your saving throw equal to the damage dealt. At 10th level, the damage increases to {@damage 1d8}."
+								"As a reaction when a creature forces you to make a saving throw, you can choose to lash out at the offender with your mind. The creature takes {@damage 1d4} psychic damage. You gain a bonus to all your saving throws equal to the damage dealt until the start of your next turn. At 10th level, the damage increases to {@damage 1d8}."
 							]
 						}
 					]
@@ -1837,7 +1866,7 @@
 			"level": 3,
 			"header": 1,
 			"entries": [
-				"Starting from 3rd level, you can speak telepathically to any creature you can see within 60 feet of you. Your telepathic utterances are in a language you know, and the creature understands you only if it knows that language. Your communication doesn't give the creature the ability to respond to you telepathically."
+				"Starting from 3rd level, you can speak telepathically to any creature you can see within 60 feet of you. Your telepathic utterances are in a language you know, and the creature understands you only if it knows that language. You can speak in this way to one creature at a time, and the creature can respond to you."
 			]
 		},
 		{
@@ -1885,7 +1914,7 @@
 			"level": 10,
 			"header": 2,
 			"entries": [
-				"Amidst the destruction of your elemental breath reigns confusion. Starting from 10th level, when you use your {@classFeature Dragon's Breath|Demi-Dragon|TheDemiDragon|1|TheDemiDragon|Dragon's Breath} feature, you can use your bonus action to psionically overwhelm one target that failed its save against your Dragon's Breath. That creature must make a Wisdom saving throw against your Dragon Spark save DC or be {@condition incapacitated} until the end of their next turn."
+				"Amidst the destruction of your elemental breath reigns confusion. Starting from 10th level, when you use your {@classFeature Dragon's Breath|Demi-Dragon|TheDemiDragon|1|TheDemiDragon|Dragon's Breath} feature, you can use your bonus action to psionically overwhelm one target that took damage from your Dragon's Breath. That creature must make a Wisdom saving throw against your Dragon Spark save DC or be {@condition incapacitated} until the end of their next turn."
 			]
 		},
 		{
@@ -2111,13 +2140,13 @@
 							"Emerald",
 							"Psychic",
 							"Burrow",
-							"Delusion Zone"
+							"Discordant Disruption"
 						],
 						[
 							"Sapphire",
 							"Thunder",
 							"Burrow or Climb",
-							"Thunderous Disruption"
+							"Trembling Thunder"
 						],
 						[
 							"Topaz",
@@ -2160,9 +2189,9 @@
 						},
 						{
 							"type": "entries",
-							"name": "Delusion Zone",
+							"name": "Discordant Disruption",
 							"entries": [
-								"As an action, you craft a shared delusion in the mind of each creature in a radius equal to your Cone Range, at a location you choose within your Line Range. When a creature moves into the area of the delusion or starts its turn there, that creature must succeed on a Wisdom saving throw against your Dragon Spark save DC or be affected by the delusion until the start of their next turn. While caught in the delusion, a creature is convinced that it is surrounded by illusory shapes. Each time the creature makes an attack while the effect lasts, you roll a d20 to determine whether the attack instead targets one of your illusory shapes. If you roll an 11 or higher, you force the creature to instead attack and destroy one of your illusory shapes. You have a number of illusory shapes equal to your proficiency bonus, and your delusion lasts for 1 minute or until you have no illusory shapes left. While the effect lasts, you can move the delusion up to 30 feet as a bonus action."
+								"As a bonus action, you focus a mind-disrupting sound upon one creature of your choice that you can see within your Line Range. The creature must succeed on a Wisdom saving throw against your Dragon Spark save DC or take psychic damage equal to your Dragon's Breath Damage and be stunned until the end of its next turn. On a successful saving throw, a creature takes half the damage and isn't stunned. At your option, you can choose to deal no damage."
 							]
 						},
 						{
@@ -2216,9 +2245,9 @@
 						},
 						{
 							"type": "entries",
-							"name": "Thunderous Disruption",
+							"name": "Trembling Thunder",
 							"entries": [
-								"As a bonus action, you launch a thunderous detonation of sound that can be heard up to 100 feet away at one creature you can see within your Line Range. The creature must succeed on a Constitution saving throw against your Dragon Spark save DC or take thunder damage and be {@condition incapacitated} until the end of its next turn. On a successful saving throw, a creature takes half the damage and isn't incapacitated. The damage follows the progression of your Dragon's Breath Damage, but using d4s in place of d8s."
+								"As an action, you launch a frightful burst of sound that can be heard up to 300 feet away at up to two creatures of your choice that you can see within your Line Range. Each creature must succeed on a Constitution saving throw against your Dragon Spark save DC or take thunder damage equal to your Dragon's Breath Damage and be frightened of you for 1 minute. On a successful save, a creature takes half damage and is not frightened. A frightened creature can repeat the saving throw at the end of each of its turns, ending the effect on itself on a success."
 							]
 						}
 					]
@@ -2255,9 +2284,9 @@
 						},
 						{
 							"type": "entries",
-							"name": "Mirage Synthesis",
+							"name": "Lingering Soundburst",
 							"entries": [
-								"When you create your Delusion Zone, you can choose to include additional illusory effects. At an area of your choice within the delusion, you create a silent image that does not require your concentration and which lasts until the delusion ends. Each time you move your delusion, you can choose to change the appearance and position of the silent image, but it must always be within the area of the delusion."
+								"When your Discordant Disruption stun condition expires, the target drops prone, and every creature within 10 feet of the target is pushed 10 feet away from the target."
 							]
 						},
 						{
@@ -2304,9 +2333,9 @@
 						},
 						{
 							"type": "entries",
-							"name": "Awesome Shockwave",
+							"name": "Imposing Fear",
 							"entries": [
-								"When a creature fails its saving throw against your Thunderous Disruption, it is additionally {@condition stunned} until the end of its next turn, and you can choose to push it up to 10 feet away from you."
+								"As a reaction that you can take while a creature is frightened by your Trembling Thunder, you can force each target to spend at least 10 feet of its movement to move away from you during its next turn. A creature that is unable to do so on its turn instead drops prone."
 							]
 						}
 					]
@@ -2671,7 +2700,8 @@
 			"level": 3,
 			"header": 1,
 			"entries": [
-				"Starting at 3rd level, the pride and joy of your hoard takes the form of a special centerpiece item, which is imbued with your draconic magic as a nascent focal point of your lair. During a short or long rest, you can designate one item in your possession as your hoard centerpiece. The item can benefit from any enchantments that you have available via Absorb Magic as if it were a part of you, but is also subject to the same restrictions. When you designate an item, choose from the following benefits to apply to it:",
+				"Starting at 3rd level, the pride and joy of your hoard takes the form of a special centerpiece item, which is imbued with your draconic magic as a nascent focal point of your lair. During a short or long rest, you can designate one item in your possession as your hoard centerpiece. The item can benefit from any enchantments that you have available via Absorb Magic as if it were a part of you, but is also subject to the same restrictions. While the item is in your possession, you can use it to conjure temporary replicas of your hoard, such as spectral swords or piles of coins. You can make melee weapon attacks with these {@item hoard replica|TheDemiDragon}s, and they count as a natural weapon for you. On a hit, you deal 2d6 bludgeoning, piercing, or slashing damage (your choice), and you add your Charisma modifier to the attack and damage rolls.",
+				"When you designate a centerpiece item, choose from the following benefits to apply to it:",
 				{
 					"type": "entries",
 					"entries": [
@@ -2679,7 +2709,7 @@
 							"type": "entries",
 							"name": "Reach of the Hoard",
 							"entries": [
-								"Your {@item hoard centerpiece|TheDemiDragon} takes the form of a melee weapon, a rod, a large gemstone, a piece of furniture, a collection of coins, or some other perilous object. You can magically float the centerpiece item while it remains within 20 feet of you, and you can use it to make melee weapon attacks. It counts as a natural melee weapon for you, and you add your Charisma modifier to the attack and damage rolls when you attack with it. The centerpiece item deals 2d6 damage of a type determined by the DM and has a reach of 20 feet, but cannot be used to make opportunity attacks. When you attack with the centerpiece item, you can optionally choose to conjure a spectral copy of it as part of the attack."
+								"The centerpiece item takes the form of a weapon, a rod, a large gemstone, a collection of coins, or some other perilous object. You can magically float the centerpiece item while it remains within 30 feet of you. Additionally, when you attack with your {@item hoard replica|TheDemiDragon} weapon on your turn, its reach increases to 30 feet."
 							]
 						}
 					]
@@ -2980,6 +3010,10 @@
 							"type": "refOptionalfeature",
 							"optionalfeature": "Disruption|TheDemiDragon"
 						},
+						{
+							"type": "refOptionalfeature",
+							"optionalfeature": "Dominion|TheDemiDragon"
+						},
 						{
 							"type": "refOptionalfeature",
 							"optionalfeature": "Freedom|TheDemiDragon"
@@ -3417,118 +3451,561 @@
 				"At 17th level, you are swift and free as the wind. Your walking and flying speeds each increase by 20.",
 				"Additionally, when you use Wing Surge, your speed can't be reduced in any way until the start of your next turn."
 			]
-		}
-	],
-	"optionalfeature": [
-		{
-			"name": "Bolstering Roar (1)",
-			"source": "TheDemiDragon",
-			"featureType": [
-				"MV:J"
-			],
-			"entries": [
-				"As a bonus action, you bolster the conviction of your companions. Each creature of your choice other than yourself that is within 20 feet of you and which can see or hear you gain a Bolster die, a d4. Once within the next 10 minutes, the creature can roll the die and add the number rolled to one saving throw it makes. The creature can wait until after it rolls the d20, but must decide before the DM says whether the roll succeeds or fails. Once the Bolster die is rolled, it is lost. A creature can only have one Bolster die at a time."
-			]
 		},
 		{
-			"name": "Hammering Lunge (1)",
+			"name": "Embodiment of the Packlord",
 			"source": "TheDemiDragon",
-			"featureType": [
-				"MV:J"
-			],
+			"className": "Demi-Dragon",
+			"classSource": "TheDemiDragon",
+			"subclassShortName": "Packlord",
+			"subclassSource": "TheDemiDragon",
+			"level": 3,
 			"entries": [
-				"As a bonus action, make an attack with your {@item horns|TheDemiDragon} against a target. You can choose to move up to 10 feet without provoking opportunity attacks before you make this attack."
+				"You've forged a powerful bond with a group of humanoid creatures who have become your minions. Perhaps you are an industrious taskmaster, or maybe you have befriended your dear minions, or shared the magical nature of your draconic power with them. Regardless, the pack stands ready to assist you.",
+				{
+					"type": "refSubclassFeature",
+					"subclassFeature": "Unleash Pack|Demi-Dragon|TheDemiDragon|Packlord|TheDemiDragon|3"
+				},
+				{
+					"type": "refSubclassFeature",
+					"subclassFeature": "Pack Conductor|Demi-Dragon|TheDemiDragon|Packlord|TheDemiDragon|3"
+				}
 			]
 		},
 		{
-			"name": "Launch Ally (1)",
+			"name": "Unleash Pack",
 			"source": "TheDemiDragon",
-			"featureType": [
-				"MV:J"
-			],
+			"className": "Demi-Dragon",
+			"classSource": "TheDemiDragon",
+			"subclassShortName": "Packlord",
+			"subclassSource": "TheDemiDragon",
+			"level": 3,
+			"header": 1,
 			"entries": [
-				"As a bonus action, choose a friendly creature within 5 feet of you that is the same size category as you or smaller. That creature can use its reaction to let you launch it to an unoccupied space you can see within a number of feet of it equal to twice your Strength score."
+				"At 3rd level, your minions stand ready to assist you with tricks and sheer numbers. As a bonus action, you designate an object or a creature on the ground that you can see that is within 60 feet of you. The target becomes the focus of your minions, who hinder the target and set up your attacks. The target's speed is halved, it has disadvantage on saving throws against your Dragon's Breath, and you have advantage on your attacks against the target.",
+				"Your minions will harass the target for up to 1 minute or until you use this ability again, but the minions scatter if they take damage equal to 3 x your demi-dragon level. They use your AC and saving throws, count as a swarm of humanoids, and are immune to the element you chose for Dragon's Breath.",
+				"You can use this feature twice, and must then complete a short or long rest to use it again."
 			]
 		},
 		{
-			"name": "Lockjaw (1)",
+			"name": "Pack Conductor",
 			"source": "TheDemiDragon",
-			"featureType": [
-				"MV:J"
-			],
+			"className": "Demi-Dragon",
+			"classSource": "TheDemiDragon",
+			"subclassShortName": "Packlord",
+			"subclassSource": "TheDemiDragon",
+			"level": 3,
+			"header": 1,
 			"entries": [
-				"As part of the {@action Attack} action, you can replace one attack you make with a special {@item bite|TheDemiDragon} attack against a target. On a hit, the target must make a Strength saving throw if it's a creature that is up to one size category larger than you. On a failure, it is {@condition grappled}."
+				"At 3rd level, you always have eager minions willing to run errands or perform chores for you. As an action, you can invoke one of the following spells, but it does not count as a spell for you, and does not require material components. Each spell additionally has the noted changes:",
+				"Additionally, when you use Wing Surge, your speed can't be reduced in any way until the start of your next turn.",
+				{
+					"type": "entries",
+					"entries": [
+						{
+							"type": "entries",
+							"name": "Animal Messenger",
+							"entries": [
+								"The messenger is a humanoid and takes the form of one of your minions."
+							]
+						},
+						{
+							"type": "entries",
+							"name": "Alarm",
+							"entries": [
+								"You cannot choose a mental alarm, and the sound of the alarm is a warning given by one of your minions."
+							]
+						},
+						{
+							"type": "entries",
+							"name": "Find Familiar",
+							"entries": [
+								"The familiar is immune to the element you chose for Dragon's Breath, is a humanoid with a CR no higher than 1/4th, and lasts for one hour. You can only have one familiar, as normal."
+							]
+						},
+						{
+							"type": "entries",
+							"name": "Mage Hand",
+							"entries": [
+								"Your acrobatic minions work together to fetch or hold objects at your direction, but cannot float."
+							]
+						},
+						{
+							"type": "entries",
+							"name": "Magic Mouth",
+							"entries": [
+								"The message is delivered by one of your minions who is a creature rather than an object, and will wait at most 8 hours before departing, ending the effect."
+							]
+						},
+						{
+							"type": "entries",
+							"name": "Prestidigitation",
+							"entries": [
+								"Your minions use their talents to create the effect, but cannot produce any illusory effect."
+							]
+						},
+						{
+							"type": "entries",
+							"name": "Tenser's Floating Disk",
+							"entries": [
+								"The disk is a mundane surface carried by a group of your minions."
+							]
+						},
+						{
+							"type": "entries",
+							"name": "Unseen Servant",
+							"entries": [
+								"The servant is a humanoid and takes the form of one of your minions."
+							]
+						}
+					]
+				},
+				"Once you invoke one of these non-cantrip spells, you can't do so again until you finish a short or long rest. At 6th level, you can use this feature three times per rest. At 10th level, you can use this feature at will."
 			]
 		},
 		{
-			"name": "Skylaunch (1)",
+			"name": "Raucous Pack",
 			"source": "TheDemiDragon",
-			"featureType": [
-				"MV:J"
-			],
+			"className": "Demi-Dragon",
+			"classSource": "TheDemiDragon",
+			"subclassShortName": "Packlord",
+			"subclassSource": "TheDemiDragon",
+			"level": 6,
+			"header": 2,
 			"entries": [
-				"As a bonus action, you spread your wings and launch 15 feet into the air. This maneuver doesn't expend your movement and doesn't provoke opportunity attacks. Creatures up to one size category larger than you that are within 5 feet of you must succeed on a Strength saving throw or be knocked prone by a powerful gust of wind as you launch. You remain airborne until the start of your next turn or until you are incapacitated."
+				"At 6th level, your minions learn new tricks to hinder your foes. As part of the bonus action you use for Unleash Pack, or as a bonus action that you can take on subsequent turns, you can choose one of the following options to activate.",
+				{
+					"type": "list",
+					"items": [
+						"One creature of your choice within 10 feet of the target of Unleash Pack has disadvantage on the first attack it makes before the start of your next turn.",
+						"One creature of your choice within 10 feet of the target of Unleash Pack must make a Strength saving throw against your Dragon Spark save DC. On a failure, the target is either knocked prone or pushed 10 feet in a direction of your choice.",
+						"Choose one ability. One creature of your choice within 10 feet of the target of Unleash Pack has disadvantage on ability checks made with the chosen ability until the start of your next turn.",
+						"Choose a creature within 60 feet of the target. The chosen creature becomes the new target of Unleash Pack."
+					]
+				},
+				"Additionally, when the target of Unleash Pack is reduced to 0 hit points, you can choose a creature within 60 feet of the target. At the start of your next turn, the chosen creature becomes the new target of Unleash Pack."
 			]
 		},
 		{
-			"name": "Suppressing Gale (1)",
+			"name": "Packbearer",
 			"source": "TheDemiDragon",
-			"featureType": [
-				"MV:J"
-			],
+			"className": "Demi-Dragon",
+			"classSource": "TheDemiDragon",
+			"subclassShortName": "Packlord",
+			"subclassSource": "TheDemiDragon",
+			"level": 10,
+			"header": 2,
 			"entries": [
-				"As a bonus action, you blast gusts of wind at your surroundings. Creatures up to one size category larger than you within 30 feet of you must spend 2 feet of movement for every 1 foot when moving closer to you. The gale disperses gas or vapor, and extinguishes candles, torches, and smaller unprotected flames in the area. This effect lasts until the start of your next turn, until you become {@condition incapacitated}, or until you choose to end it early (no action required)."
+				"You carry your minions into battle. As a bonus action, your minions come to your assistance. You gain temporary hit points equal to your demi-dragon level + your Charisma modifier. These temporary hit points last for 10 minutes.",
+				"While you have these temporary hit points, you can choose for damage you take to bypass your temporary hit points. Additionally, when you end your turn while you have these temporary hit points, you can use a reaction to command your minions to make a ranged weapon attack against a target of your choice within 60 feet of you that you can see, using your Dragon Spark attack modifier. On a hit, the target takes 1d4 + your Charisma modifier piercing damage.",
+				"Once you use this feature, you must finish a short or long rest to use it again."
 			]
 		},
 		{
-			"name": "Thieving Talons (1)",
+			"name": "Pack Morale",
 			"source": "TheDemiDragon",
-			"featureType": [
-				"MV:J"
-			],
+			"className": "Demi-Dragon",
+			"classSource": "TheDemiDragon",
+			"subclassShortName": "Packlord",
+			"subclassSource": "TheDemiDragon",
+			"level": 17,
+			"header": 2,
 			"entries": [
-				"As a bonus action, make an attack with your {@item wings|TheDemiDragon}. On a hit, the target must succeed on a Strength saving throw or drop one item of your choice that it's holding. The object lands at its feet."
+				"Your minions always have your back. Once per round when you fail a saving throw while Unleash Pack or Packbearer is active, you can choose to reroll the saving throw and must use the new roll."
 			]
 		},
 		{
-			"name": "Brutal Dive (2)",
+			"name": "Embodiment of the Echo",
 			"source": "TheDemiDragon",
-			"featureType": [
-				"MV:J"
-			],
+			"className": "Demi-Dragon",
+			"classSource": "TheDemiDragon",
+			"subclassShortName": "Echo",
+			"subclassSource": "TheDemiDragon",
+			"level": 3,
 			"entries": [
-				"As a bonus action that you can take while gliding or flying, you dive up to your Glide/Fly speed directly downwards. If you move at least 30 feet during your dive, choose one creature up to one size category larger than you that is within melee range. The creature must make a Strength saving throw. On a failed save, the target is knocked {@condition Prone}. As part of the same bonus action, you can then immediately make a {@item bite|TheDemiDragon} attack against the creature."
+				"Every dragon is unique, but few know it like you do. You mystically draw on the essence of other dragons to embolden yourself with their powers and ideals. While you do not have precise control over the echoes you call upon to aid you, you have a breadth of experience that others cannot rival.",
+				{
+					"type": "refSubclassFeature",
+					"subclassFeature": "Seek Echo|Demi-Dragon|TheDemiDragon|Echo|TheDemiDragon|3"
+				}
 			]
 		},
 		{
-			"name": "Defiance (2)",
+			"name": "Seek Echo",
 			"source": "TheDemiDragon",
-			"featureType": [
-				"MV:J"
-			],
+			"className": "Demi-Dragon",
+			"classSource": "TheDemiDragon",
+			"subclassShortName": "Echo",
+			"subclassSource": "TheDemiDragon",
+			"level": 3,
+			"header": 1,
 			"entries": [
-				"As a bonus action, you steel yourself against all attackers. Until the start of your next turn, you gain resistance to all damage."
+				"At 3rd level, you can seek inspiration from the echoes of your brethren. During a long rest, you can manifest the strength of another dragon, gaining some of the benefits of a different Draconic Embodiment. Roll 2d12 and consult the chart below. You can choose the result from either roll to become your echo. As your echo, you gain all 3rd-level features associated with the chosen Draconic Embodiment. Any spell slots, ability charges, or other limited resources unique to the Draconic Embodiment are treated as if you were 3rd level. For example, if you are a 10th-level Echo and choose the Embodiment of the Scion as your echo, you will receive one of the options from Bloodline Heritage, and one use of an Ardent Gift which scales in damage and range along with your normal Dragon's Breath.",
+				{
+					"type": "table",
+					"colLabels": [
+						"d12",
+						"Draconic Embodiment"
+					],
+					"colStyles": [
+						"col-6",
+						"col-6"
+					],
+					"rows": [
+						[
+							"1",
+							"Juggernaut"
+						],
+						[
+							"2",
+							"Behemoth"
+						],
+						[
+							"3",
+							"Shadestalker"
+						],
+						[
+							"4",
+							"Skyterror"
+						],
+						[
+							"5",
+							"Sibilant"
+						],
+						[
+							"6",
+							"Scion"
+						],
+						[
+							"7",
+							"Ascetic"
+						],
+						[
+							"8",
+							"Arbiter"
+						],
+						[
+							"9",
+							"Fervent Hoarder"
+						],
+						[
+							"10",
+							"Packlord"
+						],
+						[
+							"11",
+							"Metamorph"
+						],
+						[
+							"12",
+							"Choose any"
+						]
+					]
+				},
+				"You can choose to seek a different Draconic Embodiment to echo every time you finish a long rest, rolling again on the table and gaining a new selection of features. At 6th level, you can roll 3d12 when selecting your Draconic Embodiment. At 10th level, you can roll 4d12 when selecting your Draconic Embodiment."
 			]
 		},
 		{
-			"name": "Fearsome Wound (2)",
+			"name": "Essence In Flux",
 			"source": "TheDemiDragon",
-			"featureType": [
-				"MV:J"
-			],
+			"className": "Demi-Dragon",
+			"classSource": "TheDemiDragon",
+			"subclassShortName": "Echo",
+			"subclassSource": "TheDemiDragon",
+			"level": 6,
+			"header": 2,
 			"entries": [
-				"As a bonus action, make a {@item claws|TheDemiDragon} attack against a target. On a hit, the target is wounded, causing it to bleed for an additional {@damage 1d6} damage at the end of its next turn. Additionally, it must make a Wisdom saving throw. On a failed save, it is {@condition frightened} of you until the end of its next turn."
+				"At 6th level, your echoes change you fundamentally. Each time you use Seek Echo, you can select one skill to gain proficiency in. You keep the proficiency until you choose another skill to become proficient in. Additionally, whenever finish a long rest, you can choose to roll on the table below. Your Dragon's Breath changes to match the result. Instead of rolling on the table, you can choose to revert your Dragon's Breath element to your original choice.",
+				{
+					"type": "table",
+					"colLabels": [
+						"d10",
+						"Dragon's Breath Element"
+					],
+					"colStyles": [
+						"col-6",
+						"col-6"
+					],
+					"rows": [
+						[
+							"1",
+							"Acid"
+						],
+						[
+							"2",
+							"Cold"
+						],
+						[
+							"3",
+							"Fire"
+						],
+						[
+							"4",
+							"Force"
+						],
+						[
+							"5",
+							"Lightning"
+						],
+						[
+							"6",
+							"Necrotic"
+						],
+						[
+							"7",
+							"Poison"
+						],
+						[
+							"8",
+							"Psychic"
+						],
+						[
+							"9",
+							"Radiant"
+						],
+						[
+							"10",
+							"Thunder"
+						]
+					]
+				}
 			]
 		},
 		{
-			"name": "Reprisal (2)",
+			"name": "Distant Insight",
 			"source": "TheDemiDragon",
-			"featureType": [
-				"MV:J"
-			],
+			"className": "Demi-Dragon",
+			"classSource": "TheDemiDragon",
+			"subclassShortName": "Echo",
+			"subclassSource": "TheDemiDragon",
+			"level": 6,
+			"header": 2,
 			"entries": [
-				"When a creature misses you with a melee attack, you can use your reaction to make a {@item horns|TheDemiDragon} attack against the creature. On a hit, the creature must succeed on a Constitution saving throw or be unable to take reactions until the start of its next turn."
-			]
+				"At 6th level, experiencing different echoes has granted you a deep understanding of the life they lived, distilled to aid you. Whenever you complete a long rest, you can choose to roll on the table below to determine your insight. You gain the associated benefit until you choose to change it during another long rest.",
+				{
+					"type": "table",
+					"colLabels": [
+						"d6",
+						"Insight"
+					],
+					"colStyles": [
+						"col-6",
+						"col-6"
+					],
+					"rows": [
+						[
+							"1",
+							"Change of Scales"
+						],
+						[
+							"2",
+							"Community of Stone"
+						],
+						[
+							"3",
+							"Explorer's Exuberance"
+						],
+						[
+							"4",
+							"Forgotten Champion"
+						],
+						[
+							"5",
+							"Rising Struggle"
+						],
+						[
+							"6",
+							"War of Tongues"
+						]
+					]
+				},
+				{
+					"type": "entries",
+					"entries": [
+						{
+							"type": "entries",
+							"name": "Change of Scales",
+							"entries": [
+								"You remember self-loathing, a dear friend, and the freedom to change. Whenever you miss an attack or fail a saving throw, you give yourself a fortuity dice, a d4. You can have up to three fortuity dice at once. Whenever you miss an attack or fail a saving throw, you can choose to roll one or more of your fortuity dice, expending the dice and giving yourself a bonus to the roll equal to the number rolled."
+							]
+						},
+						{
+							"type": "entries",
+							"name": "Community of Stone",
+							"entries": [
+								"You remember a mountain, a family, and the sharing of truths. When you take damage, you can use your reaction to roll a d6. Add your Charisma modifier to the number rolled and reduce the damage by that total. Additionally, you can cast the detect thoughts spell once per short rest, using your Dragon Spark as your spellcasting ability."
+							]
+						},
+						{
+							"type": "entries",
+							"name": "Explorer's Exuberance",
+							"entries": [
+								"You remember the energy of youth, leaping movement, and the accumulation of trinkets. Your Aided Jump now triples your maximum jump distances, and once on your own turn when you high jump, you don't need to spend movement as part of the jump. When you end your turn while gliding, you gain temporary hit points equal to your proficiency bonus."
+							]
+						},
+						{
+							"type": "entries",
+							"name": "Forgotten Champion",
+							"entries": [
+								"You remember a broken people, a reversal of fortunes, and a systematic extermination of a dire threat. For up to 1 minute after you roll for initiative, you gain one use of Dragon's Breath that does not expend a use of the ability."
+							]
+						},
+						{
+							"type": "entries",
+							"name": "Rising Struggle",
+							"entries": [
+								"You remember endless tunnels, struggle, and cunning plans. As an action, you prepare your companions with a sense of unity. Choose up to three creatures other than yourself. Whenever a target makes an ability check or a saving throw, the target can roll a d4 and add the number rolled to the ability check or saving throw. The benefit is lost if you choose new targets or after 8 hours."
+							]
+						},
+						{
+							"type": "entries",
+							"name": "War of Tongues",
+							"entries": [
+								"You remember troop movements, fire, and a close companion. As an action, you can designate a friendly creature as your bond. When you or your bonded target start your turn within 10 feet of the other, you or the target gain advantage on the first attack roll made that turn. Additionally, you and the bonded creature can speak telepathically with each other while the two of you are within 300 feet of each other. The bond lasts for 8 hours or until you designate another target as your bond."
+							]
+						}
+					]
+				}
+			]
+		},
+		{
+			"name": "Twinned Echo",
+			"source": "TheDemiDragon",
+			"className": "Demi-Dragon",
+			"classSource": "TheDemiDragon",
+			"subclassShortName": "Echo",
+			"subclassSource": "TheDemiDragon",
+			"level": 10,
+			"header": 2,
+			"entries": [
+				"At 10th level, you can briefly imbue yourself with multiple echoes. Whenever you roll on the Draconic Embodiment table, you can choose an additional Draconic Embodiment from those you rolled, following the same rules as Seek Echo. You do not immediately gain the benefits of the chosen Draconic Embodiment, but must make your choices for it during the long rest.",
+				"At the start of each of your turns, you can choose to activate your twinned echo. If you do, you immediately gain all the benefits of the chosen Draconic Embodiment in addition to those gained from Seek Echo. Your twinned echo lasts for 10 minutes, after which the benefits are lost. Once you activate your twinned echo, you cannot do so again until you finish a long rest."
+			]
+		},
+		{
+			"name": "Devour Fate",
+			"source": "TheDemiDragon",
+			"className": "Demi-Dragon",
+			"classSource": "TheDemiDragon",
+			"subclassShortName": "Echo",
+			"subclassSource": "TheDemiDragon",
+			"level": 17,
+			"header": 2,
+			"entries": [
+				"At 17th level, the fate and identity of the echoes you wield are yours to determine. When you use Devour Magic, you can choose to roll again on the tables for one or both of your current selections for Essence In Flux and Distant Insight. When you do, you additionally regain a number of hit points equal to the number rolled on each die that you roll for Essence In Flux or Distant Insight."
+			]
+		}
+	],
+	"optionalfeature": [
+		{
+			"name": "Bolstering Roar (1)",
+			"source": "TheDemiDragon",
+			"featureType": [
+				"MV:J"
+			],
+			"entries": [
+				"As a bonus action, you bolster the conviction of your companions. Each creature of your choice other than yourself that is within 20 feet of you and which can see or hear you gain a Bolster die, a d4. Once within the next 10 minutes, the creature can roll the die and add the number rolled to one saving throw it makes. The creature can wait until after it rolls the d20, but must decide before the DM says whether the roll succeeds or fails. Once the Bolster die is rolled, it is lost. A creature can only have one Bolster die at a time."
+			]
+		},
+		{
+			"name": "Hammering Lunge (1)",
+			"source": "TheDemiDragon",
+			"featureType": [
+				"MV:J"
+			],
+			"entries": [
+				"As a bonus action, make an attack with your {@item horns|TheDemiDragon} against a target. You can choose to move up to 10 feet without provoking opportunity attacks before you make this attack."
+			]
+		},
+		{
+			"name": "Launch Ally (1)",
+			"source": "TheDemiDragon",
+			"featureType": [
+				"MV:J"
+			],
+			"entries": [
+				"As a bonus action, choose a friendly creature within 5 feet of you that is the same size category as you or smaller. That creature can use its reaction to let you launch it to an unoccupied space you can see within a number of feet of it equal to twice your Strength score. Additionally, the creature gains temporary hit points equal to your proficiency bonus."
+			]
+		},
+		{
+			"name": "Lockjaw (1)",
+			"source": "TheDemiDragon",
+			"featureType": [
+				"MV:J"
+			],
+			"entries": [
+				"As part of the {@action Attack} action, you can replace one attack you make with a special {@item bite|TheDemiDragon} attack against a target. On a hit, the target must make a Strength saving throw if it's a creature that is up to one size category larger than you. On a failure, it is {@condition grappled}."
+			]
+		},
+		{
+			"name": "Skylaunch (1)",
+			"source": "TheDemiDragon",
+			"featureType": [
+				"MV:J"
+			],
+			"entries": [
+				"As a bonus action, you spread your wings and launch 15 feet into the air. This maneuver doesn't expend your movement and doesn't provoke opportunity attacks. Creatures up to one size category larger than you that are within 5 feet of you must succeed on a Strength saving throw or be knocked prone by a powerful gust of wind as you launch. You remain airborne until the start of your next turn or until you are incapacitated."
+			]
+		},
+		{
+			"name": "Suppressing Gale (1)",
+			"source": "TheDemiDragon",
+			"featureType": [
+				"MV:J"
+			],
+			"entries": [
+				"As a bonus action, you blast gusts of wind at your surroundings. Creatures up to one size category larger than you within 30 feet of you must spend 2 feet of movement for every 1 foot when moving closer to you. The gale disperses gas or vapor, and extinguishes candles, torches, and smaller unprotected flames in the area. This effect lasts until the start of your next turn, until you become {@condition incapacitated}, or until you choose to end it early (no action required)."
+			]
+		},
+		{
+			"name": "Thieving Talons (1)",
+			"source": "TheDemiDragon",
+			"featureType": [
+				"MV:J"
+			],
+			"entries": [
+				"As a bonus action, make an attack with your {@item wings|TheDemiDragon}. On a hit, the target must succeed on a Strength saving throw or drop one item of your choice that it's holding. The object lands at its feet."
+			]
+		},
+		{
+			"name": "Brutal Dive (2)",
+			"source": "TheDemiDragon",
+			"featureType": [
+				"MV:J"
+			],
+			"entries": [
+				"As a bonus action that you can take while gliding or flying, you dive up to your Glide/Fly speed directly downwards. If you move at least 30 feet during your dive, choose one creature up to one size category larger than you that is within melee range. The creature must make a Strength saving throw. On a failed save, the target is knocked {@condition Prone}. As part of the same bonus action, you can then immediately make a {@item bite|TheDemiDragon} attack against the creature."
+			]
+		},
+		{
+			"name": "Defiance (2)",
+			"source": "TheDemiDragon",
+			"featureType": [
+				"MV:J"
+			],
+			"entries": [
+				"As a bonus action, you steel yourself against all attackers. Until the start of your next turn, you gain resistance to all damage and advantage on Intelligence, Wisdom, and Charisma saving throws."
+			]
+		},
+		{
+			"name": "Fearsome Wound (2)",
+			"source": "TheDemiDragon",
+			"featureType": [
+				"MV:J"
+			],
+			"entries": [
+				"As a bonus action, make a {@item claws|TheDemiDragon} attack against a target. On a hit, the target is wounded, causing it to bleed for an additional {@damage 1d8} damage at the end of its next turn. Additionally, it must make a Wisdom saving throw. On a failed save, it is {@condition frightened} of you until the end of its next turn."
+			]
+		},
+		{
+			"name": "Reprisal (2)",
+			"source": "TheDemiDragon",
+			"featureType": [
+				"MV:J"
+			],
+			"entries": [
+				"When a creature misses you with a melee attack, you can use your reaction to make a {@item horns|TheDemiDragon} attack against the creature. On a hit, the creature must succeed on a Constitution saving throw or be unable to take reactions until the start of its next turn."
+			]
 		},
 		{
 			"name": "Rising Wing (2)",
@@ -3540,6 +4017,16 @@
 				"As part of the Attack action, you can replace one attack you make with a special {@item wings|TheDemiDragon} attack against a target. On a hit, the target must make a Strength saving throw if it's a creature that is up to one size category larger than you. On a failure, you knock the target 20 feet upwards. At your option, you can choose to prevent the target from falling until the end of your turn."
 			]
 		},
+		{
+			"name": "Mighty Toss (2)",
+			"source": "TheDemiDragon",
+			"featureType": [
+				"MV:J"
+			],
+			"entries": [
+				"As a bonus action, you heft one creature within 5 feet of you. The creature must make a Strength saving throw. On a failed save, the creature is {@condition incapacitated} until the end of your turn, and you can toss the creature at a target of your choice within 20 feet. Make a ranged attack roll with your Strength modifier against the target of your toss. On a hit, both the target and the tossed creature take damage equal to {@damage 1d4} + your Strength modifier. On a miss, the tossed creature still takes the damage. The creature then moves to a square of your choice adjacent to the target."
+			]
+		},
 		{
 			"name": "Battering Ram (3)",
 			"source": "TheDemiDragon",
@@ -3720,6 +4207,41 @@
 				}
 			]
 		},
+		{
+			"name": "Dominion",
+			"source": "TheDemiDragon",
+			"featureType": [
+				"Morph"
+			],
+			"entries": [
+				{
+					"type": "list",
+					"items": [
+						{
+							"name": "Whispering Thoughts",
+							"type": "entries",
+							"entries": [
+								"You can speak telepathically to any creature within 120 feet of you. The creature understands you only if the two of you share a language. You can speak telepathically in this way to one creature at a time. Additionally, as an action, you can choose one creature which you are aware of within 60 feet of you. The creature must succeed on an Intelligence saving throw against your Dragon Spark save DC or be {@condition stunned} until the end of your next turn. You can attempt to stun a target with this feature once, and must then complete a short or long rest before you can do so again."
+							]
+						},
+						{
+							"name": "Aberrant Limbs",
+							"type": "entries",
+							"entries": [
+								"Your tail splits into two grasping tentacles, each of which you can use to hold objects or creatures. Whenever you hit a creature with a tail attack, the creature must succeed on a Strength saving throw or become grappled by you.",
+								{
+									"type": "abilityDc",
+									"name": "Morph",
+									"attributes": [
+										"str"
+									]
+								}
+							]
+						}
+					]
+				}
+			]
+		},
 		{
 			"name": "Freedom",
 			"source": "TheDemiDragon",
@@ -3888,7 +4410,7 @@
 							"name": "Skewering Quills",
 							"type": "entries",
 							"entries": [
-								"You develop clusters of sharp quills along your limbs which you can fire in an arc at your foes. You gain a {@item quills|TheDemiDragon} natural weapon, which counts as a martial ranged weapon for you and which you are proficient with. You can use them to make ranged weapon attacks with a range of 60/120, and you add your Strength modifier to the attack and damage rolls when you attack with them. On a hit, they deal 1d10 piercing damage. Hit or miss, one square occupied by the targeted creature is then filled with quills, and you can additionally choose two squares within 5 feet of that square to also fill with quills as your inaccurate bombardment harmlessly scatters across the area. Any creature that subsequently enters a square filled with quills must succeed on a Dexterity saving throw against your Dragon Spark save DC or stop moving this turn and take 1 piercing damage. A creature moving through the area at half speed doesn't need to make the save. You can use this attack a number of times equal to 1 + your Constitution modifier (minimum 1), after which you must finish a short or long rest to use it again."
+								"You develop clusters of sharp quills along your limbs which you can fire in an arc at your foes. You gain a {@item quills|TheDemiDragon} natural weapon, which counts as a martial ranged weapon for you and which you are proficient with. You can use them to make ranged weapon attacks with a range of 60/120, and you add your Strength modifier to the attack and damage rolls when you attack with them. On a hit, they deal 2d6 piercing damage. Hit or miss, one square occupied by the targeted creature is then filled with quills, and you can additionally choose two squares within 5 feet of that square to also fill with quills as your inaccurate bombardment harmlessly scatters across the area. Any creature that subsequently enters a square filled with quills must succeed on a Dexterity saving throw against your Dragon Spark save DC or stop moving this turn and take 1 piercing damage. A creature moving through the area at half speed doesn't need to make the save. You can use this attack a number of times equal to 1 + your Constitution modifier (minimum 1), after which you must finish a short or long rest to use it again."
 							]
 						}
 					]
@@ -3937,7 +4459,7 @@
 							"name": "Numinous Dragonsong",
 							"type": "entries",
 							"entries": [
-								"As a bonus action, you can sing a wordless hymn that bolsters your allies. Your song lasts until the start of your next turn, and while it lasts you and creatures of your choice within 20 feet of you gain a bonus to death saving throws and Constitution saving throws equal to your Charisma modifier (with a minimum bonus of +1). The song ends if you are {@condition incapacitated} or if you do not maintain it with a bonus action each turn."
+								"As a bonus action, you can sing a wordless hymn that bolsters your allies. Your song lingers until the start of your next turn, and while it lasts you and creatures of your choice within 20 feet of you gain a bonus to death saving throws and Constitution saving throws equal to your Charisma modifier (with a minimum bonus of +1). The song ends if you are {@condition incapacitated} or if you do not maintain it with a bonus action each turn."
 							]
 						},
 						{
@@ -4304,7 +4826,7 @@
 			"system": {
 				"activation.type": "special",
 				"uses": {
-					"value": 4,
+					"value": 5,
 					"max": "(@classes.demi-dragon.levels >= 17 ? 10 : @classes.demi-dragon.levels >= 10 ? 8 : @classes.demi-dragon.levels >= 6 ? 6 : 4)",
 					"per": "sr"
 				}
@@ -4364,7 +4886,7 @@
 				"uses": {
 					"value": 1,
 					"max": "1",
-					"per": "lr"
+					"per": "sr"
 				}
 			}
 		},
@@ -4570,12 +5092,77 @@
 					"per": "sr"
 				}
 			}
+		},
+		{
+			"name": "Unleash Pack",
+			"source": "TheDemiDragon",
+			"className": "Demi-Dragon",
+			"classSource": "TheDemiDragon",
+			"subclassShortName": "Packlord",
+			"subclassSource": "TheDemiDragon",
+			"level": 3,
+			"system": {
+				"activation.type": "bonus action",
+				"activation.cost": 1,
+				"uses": {
+					"value": 2,
+					"max": "2",
+					"per": "sr"
+				}
+			}
+		},
+		{
+			"name": "Pack Conductor",
+			"source": "TheDemiDragon",
+			"className": "Demi-Dragon",
+			"classSource": "TheDemiDragon",
+			"subclassShortName": "Packlord",
+			"subclassSource": "TheDemiDragon",
+			"level": 3,
+			"system": {
+				"activation.type": "action",
+				"activation.cost": 1,
+				"uses": {
+					"value": 1,
+					"max": "(@classes.demi-dragon.levels >= 6 ? 3 : 1)",
+					"per": "sr"
+				}
+			}
+		},
+		{
+			"name": "Packbearer",
+			"source": "TheDemiDragon",
+			"className": "Demi-Dragon",
+			"classSource": "TheDemiDragon",
+			"subclassShortName": "Packlord",
+			"subclassSource": "TheDemiDragon",
+			"level": 10,
+			"system": {
+				"activation.type": "bonus action",
+				"activation.cost": 1,
+				"uses": {
+					"value": 1,
+					"max": "1",
+					"per": "sr"
+				}
+			}
 		}
 	],
 	"feat": [
 		{
 			"name": "Breath Versatility",
 			"source": "TheDemiDragon",
+			"ability": [
+				{
+					"choose": {
+						"from": [
+							"cha",
+							"con"
+						],
+						"amount": 1
+					}
+				}
+			],
 			"prerequisite": [
 				{
 					"race": [
@@ -4697,6 +5284,18 @@
 		{
 			"name": "Misfit's Adaptation",
 			"source": "TheDemiDragon",
+			"ability": [
+				{
+					"choose": {
+						"from": [
+							"str",
+							"cha",
+							"con"
+						],
+						"amount": 1
+					}
+				}
+			],
 			"prerequisite": [
 				{
 					"race": [
@@ -4707,7 +5306,7 @@
 				}
 			],
 			"entries": [
-				"The width of your elemental breath broadens. You gain the following benefits:",
+				"Your body continues to change in unexpected ways. You gain the following benefits:",
 				{
 					"type": "list",
 					"items": [
@@ -4787,6 +5386,16 @@
 		{
 			"name": "War Plating",
 			"source": "TheDemiDragon",
+			"ability": [
+				{
+					"choose": {
+						"from": [
+							"str"
+						],
+						"amount": 1
+					}
+				}
+			],
 			"prerequisite": [
 				{
 					"race": [
@@ -4819,20 +5428,7 @@
 					"type": "entries",
 					"name": "Natural Weapon",
 					"entries": [
-						"Natural weapons count as martial melee weapons. You can use them to make melee weapon attacks, and you add your Strength modifier to the attack and damage rolls when you attack with them."
-					]
-				}
-			]
-		},
-		{
-			"abbreviation": "FevR",
-			"source": "TheDemiDragon",
-			"entries": [
-				{
-					"type": "entries",
-					"name": "Fervent Reach",
-					"entries": [
-						"The weapon has a reach of 20 feet, but cannot be used to make opportunity attacks."
+						""
 					]
 				}
 			]
@@ -4842,6 +5438,7 @@
 		{
 			"name": "Claws",
 			"type": "M",
+			"weapon": true,
 			"rarity": "none",
 			"dmg1": "1d6",
 			"dmgType": "S",
@@ -4856,6 +5453,7 @@
 		{
 			"name": "Bite",
 			"type": "M",
+			"weapon": true,
 			"rarity": "none",
 			"dmg1": "1d12",
 			"dmgType": "P",
@@ -4870,6 +5468,7 @@
 		{
 			"name": "Tail",
 			"type": "M",
+			"weapon": true,
 			"rarity": "none",
 			"dmg1": "1d10",
 			"dmgType": "B",
@@ -4885,6 +5484,7 @@
 		{
 			"name": "Horns",
 			"type": "M",
+			"weapon": true,
 			"rarity": "none",
 			"dmg1": "2d4",
 			"dmgType": "P",
@@ -4899,6 +5499,7 @@
 		{
 			"name": "Wings",
 			"type": "M",
+			"weapon": true,
 			"rarity": "none",
 			"dmg1": "1d4",
 			"dmgType": "B",
@@ -4913,6 +5514,7 @@
 		{
 			"name": "Antlers",
 			"type": "M",
+			"weapon": true,
 			"rarity": "none",
 			"dmg1": "3d4",
 			"dmgType": "P",
@@ -4927,26 +5529,27 @@
 		{
 			"name": "Quills",
 			"type": "R",
+			"weapon": true,
 			"rarity": "none",
 			"range": "60/120",
-			"dmg1": "1d10",
+			"dmg1": "2d6",
 			"dmgType": "P",
 			"property": [
 				"NAT"
 			],
 			"entries": [
-				"Your quills deal 1d10 piercing damage. Hit or miss, one square occupied by the targeted creature is then filled with quills, and you can additionally choose two squares within 5 feet of that square to also fill with quills as your inaccurate bombardment harmlessly scatters across the area. Any creature that subsequently enters a square filled with quills must succeed on a Dexterity saving throw against your Dragon Spark save DC or stop moving this turn and take 1 piercing damage. A creature moving through the area at half speed doesn't need to make the save. You can use this attack a number of times equal to 1 + your Constitution modifier (minimum 1), after which you must finish a short or long rest to use it again."
+				"Your quills deal 2d6 piercing damage. Hit or miss, one square occupied by the targeted creature is then filled with quills, and you can additionally choose two squares within 5 feet of that square to also fill with quills as your inaccurate bombardment harmlessly scatters across the area. Any creature that subsequently enters a square filled with quills must succeed on a Dexterity saving throw against your Dragon Spark save DC or stop moving this turn and take 1 piercing damage. A creature moving through the area at half speed doesn't need to make the save. You can use this attack a number of times equal to 1 + your Constitution modifier (minimum 1), after which you must finish a short or long rest to use it again."
 			],
 			"source": "TheDemiDragon"
 		},
 		{
-			"name": "Hoard Centerpiece",
+			"name": "Hoard Replica",
 			"type": "M",
+			"weapon": true,
 			"rarity": "none",
 			"dmg1": "2d6",
 			"property": [
-				"NAT",
-				"FevR"
+				"NAT"
 			],
 			"entries": [
 				"The centerpiece item deals 2d6 damage + your Charisma modifier."
@@ -4965,6 +5568,7 @@
 			],
 			"dmg1": "1d6",
 			"dmgType": "P",
+			"weapon": true,
 			"entries": [
 				"These sturdy kite-shaped steel spades are made to fit over a creature's claws, serving as gauntlets. They are intended to reduce the strain of manual labor, and you can use them to perform the functions of a {@item shovel|PHB}, {@item crowbar|PHB}, or {@item hammer|PHB}. While wearing them, your claw attacks deal piercing damage."
 			]
@@ -5194,6 +5798,39 @@
 				"This net of white-gold filigree jewelry is made to wrap around the neck, and is shaped in arcane patterns that resonate with draining energy when in use. Your breath save DC or your Dragon Spark save DC and attack bonus increases by 1. When a creature fails their saving throw against your breath weapon, its speed is reduced by 15 feet until the start of your next turn."
 			]
 		},
+		{
+			"name": "Skybound Bolt",
+			"source": "TheDemiDragon",
+			"rarity": "very rare",
+			"baseItem": "javelin|phb",
+			"weaponCategory": "simple",
+			"reqAttune": "optional",
+			"entries": [
+				"This gilded lance is the symbol of an ancient order of dragon riders, once wielded interchangeably by both dragon and rider. You have a +1 bonus to attack and damage rolls made with this magical javelin, and it returns to the wielder's hand immediately after it is used to make a ranged attack.",
+				"If you are attuned to the javelin, you additionally gain the following benefits.",
+				{
+					"type": "entries",
+					"name": "Spells",
+					"entries": [
+						"The javelin has 10 charges. While holding it, you can expend one or more of its charges to cast one of the following spells from it, using your highest mental ability score as your spellcasting ability for the spells: {@spell feather fall|phb} (1 charge), {@spell elemental javelin|TheDemiDragon} (2 charges), {@spell spurious glide|TheDemiDragon} (2 charges), or {@spell elemental stake|TheDemiDragon} (3 charges). The javelin regains 1d6 + 4 expended charges daily at dawn."
+					]
+				},
+				{
+					"type": "entries",
+					"name": "Standard of Unity",
+					"entries": [
+						"As a bonus action, a spectral banner unfurls from the javelin, infusing you with an aura of unity for 10 minutes while you are holding the javelin. Creatures of your choice within 10 feet of you have advantage on Charisma (Intimidation) and Charisma (Persuasion), checks, and on saving throws against being {@condition frightened}. Once you use this property, you can't use it again for 1 hour."
+					]
+				},
+				{
+					"type": "entries",
+					"name": "Skybound Grip",
+					"entries": [
+						"As a bonus action, the javelin becomes a {@item lance|phb}, or vice versa. While in lance form, if you take the Ready action to make an attack with the lance, your attack deals an additional {@damage 1d12} lightning damage on a hit, and the target must make a Strength saving throw DC 15 or fall {@condition prone}."
+					]
+				}
+			]
+		},
 		{
 			"name": "Skybreaker's Wing Spurs",
 			"source": "TheDemiDragon",
@@ -5213,7 +5850,7 @@
 			"reqAttune": true,
 			"entries": [
 				"This set of thick iron chains connects to a ruby pendant, intended to be worn on the limbs and chest, respectively. The set was created by a gallant spell duelist who preferred to defeat his adversaries by turning the power of their own magic against them.",
-				"As a reaction when you see a creature within 60 feet of you casting a spell, you can attempt to interrupt the creature's spellcasting. Make an ability check using your highest mental ability score. The DC equals 10 + the spell's level. On a success, the creature's spell fails and has no effect, and you store the spell that was being cast for up to 8 hours. You can cast the spell stored in the chains, even if you can't usually cast spells. The spell uses the slot level, spell save DC, spell attack bonus, and spellcasting ability of the original caster, but is otherwise treated as if you cast the spell. Once the spell has been cast from the chains, it is no longer stored in them.",
+				"As a reaction when you see a creature within 60 feet of you casting a spell, you can attempt to interrupt the creature's spellcasting. Make an ability check using your highest mental ability score. The DC equals 10 + the spell's level. On a success, the creature’s spell fails and has no effect, and you store the spell that was being cast for up to 8 hours. You can cast the spell stored in the chains, even if you can't usually cast spells. The spell uses the slot level, spell save DC, spell attack bonus, and spellcasting ability of the original caster, but is otherwise treated as if you cast the spell. Once the spell has been cast from the chains, it is no longer stored in them.",
 				"Once you attempt to disrupt a creature's spell, it can't be used to do so again until the next dawn."
 			]
 		},
@@ -5505,8 +6142,8 @@
 				"slashing"
 			],
 			"miscTags": [
-				"FMV",
-				"SCL"
+				"SCL",
+				"FMV"
 			],
 			"areaTags": [
 				"ST"
@@ -5707,8 +6344,8 @@
 				"slashing"
 			],
 			"miscTags": [
-				"FMV",
-				"SCL"
+				"SCL",
+				"FMV"
 			],
 			"areaTags": [
 				"ST"
@@ -6052,6 +6689,109 @@
 				]
 			}
 		},
+		{
+			"name": "Pattern Draconic Essence",
+			"source": "TheDemiDragon",
+			"level": 2,
+			"school": "V",
+			"time": [
+				{
+					"number": 1,
+					"unit": "bonus action"
+				}
+			],
+			"range": {
+				"type": "point",
+				"distance": {
+					"type": "self"
+				}
+			},
+			"components": {
+				"v": true,
+				"s": true
+			},
+			"duration": [
+				{
+					"type": "timed",
+					"duration": {
+						"type": "round",
+						"amount": 1
+					}
+				}
+			],
+			"entries": [
+				"You forge a connection to a draconic bloodline to gain some of its power. When you cast the spell, choose one of the following damage types: acid, cold, fire, lightning, or poison. Each time during the duration that you deal damage, you can change the damage type to the chosen type. If you successfully deal damage of the chosen type to any target, you gain a bonus to one of the damaging effect's damage rolls and apply the appropriate effect listed below.",
+				{
+					"type": "entries",
+					"name": "Acid",
+					"entries": [
+						"Roll {@damage 1d6} and add it to the damage roll. One attack roll made against the target before the start of your next turn has advantage."
+					]
+				},
+				{
+					"type": "entries",
+					"name": "Cold",
+					"entries": [
+						"Roll {@damage 1d8} and add it to the damage roll. The target has its speed reduced by 15 feet until the start of your turn."
+					]
+				},
+				{
+					"type": "entries",
+					"name": "Fire",
+					"entries": [
+						"Roll {@damage 1d4} and add it to the damage roll. The target must succeed on a Wisdom saving throw against your spell save DC. On a failure, the target is {@condition frightened} of you until the start of your next turn."
+					]
+				},
+				{
+					"type": "entries",
+					"name": "Lightning",
+					"entries": [
+						"Roll {@damage 1d10} and add it to the damage roll. The target can't take reactions until the start of your next turn."
+					]
+				},
+				{
+					"type": "entries",
+					"name": "Poison",
+					"entries": [
+						"Roll {@damage 1d8} and add it to the damage roll. The target must succeed on a Constitution saving throw against your spell save DC. On a failure, the target is {@condition poisoned} until the start of your next turn."
+					]
+				}
+			],
+			"damageInflict": [
+				"acid",
+				"cold",
+				"fire",
+				"lightning",
+				"poison"
+			],
+			"miscTags": [
+				"FMV"
+			],
+			"conditionInflict": [
+				"poisoned",
+				"frightened"
+			],
+			"savingThrow": [
+				"wisdom",
+				"constitution"
+			],
+			"classes": {
+				"fromClassList": [
+					{
+						"name": "Sorcerer",
+						"source": "PHB"
+					},
+					{
+						"name": "Warlock",
+						"source": "PHB"
+					},
+					{
+						"name": "Wizard",
+						"source": "PHB"
+					}
+				]
+			}
+		},
 		{
 			"name": "Caesar's Faded Imprint",
 			"source": "TheDemiDragon",