diff --git a/src/packs/classes/feature_Rally_PydiMnNCKpd44SGS.json b/src/packs/classes/feature_Rally_PydiMnNCKpd44SGS.json
index cd9fe232..4b509228 100644
--- a/src/packs/classes/feature_Rally_PydiMnNCKpd44SGS.json
+++ b/src/packs/classes/feature_Rally_PydiMnNCKpd44SGS.json
@@ -5,15 +5,7 @@
   "img": "icons/tools/instruments/drum-hand-tan.webp",
   "system": {
     "description": "<p>Once per session, describe how you rally the party and give yourself and each of your allies a Rally Die. At level 1, your Rally Die is a d6. A PC can spend their Rally Die to roll it, adding the result to their action roll, reaction roll, damage roll, or to clear a number of Stress equal to the result. At the end of each session, clear all unspent Rally Dice. At level 5, your Rally Die increases to a d8.</p>",
-    "resource": {
-      "type": "simple",
-      "value": 1,
-      "max": "1",
-      "icon": "",
-      "recovery": "session",
-      "diceStates": {},
-      "dieFaces": "d4"
-    },
+    "resource": null,
     "actions": {
       "vI4Fph3y9ygsya9e": {
         "type": "effect",
@@ -25,15 +17,16 @@
         "cost": [
           {
             "scalable": false,
-            "key": "Y7waM3ljoRLyk38N",
+            "key": "hitPoints",
             "value": 1,
-            "keyIsID": true,
-            "step": null
+            "keyIsID": false,
+            "step": null,
+            "consumeOnSuccess": false
           }
         ],
         "uses": {
           "value": null,
-          "max": "",
+          "max": "1",
           "recovery": "session"
         },
         "effects": [
@@ -114,8 +107,8 @@
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1754174497668,
-    "modifiedTime": 1754246215191,
-    "lastModifiedBy": "LgnbNMLaxandgMQq"
+    "modifiedTime": 1754494820213,
+    "lastModifiedBy": "MQSznptE5yLT7kj8"
   },
   "ownership": {
     "default": 0,
diff --git a/src/packs/classes/feature_Rally__Level_5__TVeEyqmPPiRa2r3i.json b/src/packs/classes/feature_Rally__Level_5__TVeEyqmPPiRa2r3i.json
index 1f85310e..bba20558 100644
--- a/src/packs/classes/feature_Rally__Level_5__TVeEyqmPPiRa2r3i.json
+++ b/src/packs/classes/feature_Rally__Level_5__TVeEyqmPPiRa2r3i.json
@@ -5,15 +5,7 @@
   "img": "icons/tools/instruments/drum-hand-tan.webp",
   "system": {
     "description": "<p>Once per session, describe how you rally the party and give yourself and each of your allies a Rally Die. At level 1, your Rally Die is a d6. A PC can spend their Rally Die to roll it, adding the result to their action roll, reaction roll, damage roll, or to clear a number of Stress equal to the result. At the end of each session, clear all unspent Rally Dice. At level 5, your Rally Die increases to a d8.</p>",
-    "resource": {
-      "type": "simple",
-      "value": 1,
-      "max": "1",
-      "icon": "",
-      "recovery": "session",
-      "diceStates": {},
-      "dieFaces": "d4"
-    },
+    "resource": null,
     "actions": {
       "Z1KWFrpXOqZWuZD1": {
         "type": "effect",
@@ -25,15 +17,16 @@
         "cost": [
           {
             "scalable": false,
-            "key": "oxv0m8AFUQVFKtZ4",
+            "key": "hitPoints",
             "value": 1,
-            "keyIsID": true,
-            "step": null
+            "keyIsID": false,
+            "step": null,
+            "consumeOnSuccess": false
           }
         ],
         "uses": {
           "value": null,
-          "max": "",
+          "max": "1",
           "recovery": "session"
         },
         "effects": [
@@ -114,8 +107,8 @@
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1754174499893,
-    "modifiedTime": 1754246215922,
-    "lastModifiedBy": "LgnbNMLaxandgMQq"
+    "modifiedTime": 1754494835723,
+    "lastModifiedBy": "MQSznptE5yLT7kj8"
   },
   "ownership": {
     "default": 0,
diff --git a/src/packs/domains/domainCard_Cinder_Grasp_5EP2Lgf7ojfrc0Is.json b/src/packs/domains/domainCard_Cinder_Grasp_5EP2Lgf7ojfrc0Is.json
index 5630c6bb..ce88eb60 100644
--- a/src/packs/domains/domainCard_Cinder_Grasp_5EP2Lgf7ojfrc0Is.json
+++ b/src/packs/domains/domainCard_Cinder_Grasp_5EP2Lgf7ojfrc0Is.json
@@ -66,7 +66,7 @@
           }
         ],
         "roll": {
-          "type": null,
+          "type": "spellcast",
           "trait": null,
           "difficulty": null,
           "bonus": null,
@@ -154,8 +154,8 @@
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1753922784434,
-    "modifiedTime": 1754253433766,
-    "lastModifiedBy": "Q9NoTaEarn3VMS6Z"
+    "modifiedTime": 1754475145346,
+    "lastModifiedBy": "MQSznptE5yLT7kj8"
   },
   "_id": "5EP2Lgf7ojfrc0Is",
   "sort": 3400000,
diff --git a/src/packs/subclasses/feature_Clarity_of_Nature_etaQ01yGJhBLDUqZ.json b/src/packs/subclasses/feature_Clarity_of_Nature_etaQ01yGJhBLDUqZ.json
index 7906daf6..752fee05 100644
--- a/src/packs/subclasses/feature_Clarity_of_Nature_etaQ01yGJhBLDUqZ.json
+++ b/src/packs/subclasses/feature_Clarity_of_Nature_etaQ01yGJhBLDUqZ.json
@@ -6,13 +6,7 @@
   "img": "icons/magic/nature/tree-twisted-glow-yellow.webp",
   "system": {
     "description": "<p>Once per long rest, you can create a space of natural serenity within Close range. When you spend a few minutes resting within the space, clear Stress equal to your Instinct, distributed as you choose between you and your allies.</p>",
-    "resource": {
-      "type": "simple",
-      "value": 1,
-      "recovery": "longRest",
-      "max": "1",
-      "icon": ""
-    },
+    "resource": null,
     "actions": {
       "az7YUpxy1ysn12tO": {
         "type": "healing",
@@ -108,7 +102,7 @@
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1754179740310,
-    "modifiedTime": 1754353339637,
+    "modifiedTime": 1754496518048,
     "lastModifiedBy": "MQSznptE5yLT7kj8"
   },
   "_key": "!items!etaQ01yGJhBLDUqZ"
diff --git a/src/packs/subclasses/feature_Contacts_Everywhere_cXbRm744mW6UXGam.json b/src/packs/subclasses/feature_Contacts_Everywhere_cXbRm744mW6UXGam.json
index 84425f80..3c8fa5b5 100644
--- a/src/packs/subclasses/feature_Contacts_Everywhere_cXbRm744mW6UXGam.json
+++ b/src/packs/subclasses/feature_Contacts_Everywhere_cXbRm744mW6UXGam.json
@@ -6,13 +6,7 @@
   "img": "icons/skills/social/theft-pickpocket-bribery-brown.webp",
   "system": {
     "description": "<p>Once per session, you can briefly call on a shady contact. Choose one of the following benefits and describe what brought them here to help you in this moment: </p><ul><li><p>They provide 1 handful of gold, a unique tool, or a mundane object that the situation requires.</p></li><li><p>On your next action roll, their help provides a +3 bonus to the result of your Hope or Fear Die. </p></li><li><p>The next time you deal damage, they snipe from the shadows, adding 2d8 to your damage roll.</p></li></ul>",
-    "resource": {
-      "type": "simple",
-      "value": 1,
-      "max": "",
-      "icon": "",
-      "recovery": "session"
-    },
+    "resource": null,
     "actions": {
       "GZDYjtPh0lCJ5VNq": {
         "type": "effect",
@@ -24,16 +18,17 @@
         "cost": [
           {
             "scalable": false,
-            "key": "cXbRm744mW6UXGam",
+            "key": "hitPoints",
             "value": 1,
-            "keyIsID": true,
-            "step": null
+            "keyIsID": false,
+            "step": null,
+            "consumeOnSuccess": false
           }
         ],
         "uses": {
           "value": null,
-          "max": "",
-          "recovery": null
+          "max": "1",
+          "recovery": "session"
         },
         "effects": [],
         "target": {
@@ -63,8 +58,8 @@
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1754320389008,
-    "modifiedTime": 1754322535699,
-    "lastModifiedBy": "LgnbNMLaxandgMQq"
+    "modifiedTime": 1754496752362,
+    "lastModifiedBy": "MQSznptE5yLT7kj8"
   },
   "_key": "!items!cXbRm744mW6UXGam"
 }
diff --git a/src/packs/subclasses/feature_Eloquent_5bmB1YcxiJVNVXDM.json b/src/packs/subclasses/feature_Eloquent_5bmB1YcxiJVNVXDM.json
index 0d80a6f6..daca1154 100644
--- a/src/packs/subclasses/feature_Eloquent_5bmB1YcxiJVNVXDM.json
+++ b/src/packs/subclasses/feature_Eloquent_5bmB1YcxiJVNVXDM.json
@@ -5,15 +5,7 @@
   "img": "icons/skills/social/diplomacy-writing-letter.webp",
   "system": {
     "description": "<p>Your moving words boost morale. Once per session, when you encourage an ally, you can do one of the following: </p><ul><li><p>Allow them to find a mundane object or tool they need.</p></li><li><p>Help an Ally without spending Hope.</p></li><li><p>Give them an additional downtime move during their next rest.</p></li></ul>",
-    "resource": {
-      "type": "simple",
-      "value": 1,
-      "recovery": "session",
-      "max": "1",
-      "icon": "",
-      "diceStates": {},
-      "dieFaces": "d4"
-    },
+    "resource": null,
     "actions": {
       "o1MWnafbLsXnvSUl": {
         "type": "effect",
@@ -25,8 +17,8 @@
         "cost": [],
         "uses": {
           "value": null,
-          "max": "",
-          "recovery": null
+          "max": "1",
+          "recovery": "session"
         },
         "effects": [],
         "target": {
@@ -51,8 +43,8 @@
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1754174646194,
-    "modifiedTime": 1754236474581,
-    "lastModifiedBy": "LgnbNMLaxandgMQq"
+    "modifiedTime": 1754494786779,
+    "lastModifiedBy": "MQSznptE5yLT7kj8"
   },
   "ownership": {
     "default": 0,
diff --git a/src/packs/subclasses/feature_Gifted_Performer_99U7YWNCxFZHCiT0.json b/src/packs/subclasses/feature_Gifted_Performer_99U7YWNCxFZHCiT0.json
index 5319981f..57cbdc0c 100644
--- a/src/packs/subclasses/feature_Gifted_Performer_99U7YWNCxFZHCiT0.json
+++ b/src/packs/subclasses/feature_Gifted_Performer_99U7YWNCxFZHCiT0.json
@@ -16,9 +16,9 @@
         "actionType": "action",
         "cost": [],
         "uses": {
-          "value": null,
-          "max": "",
-          "recovery": null
+          "value": 0,
+          "max": "1",
+          "recovery": "longRest"
         },
         "damage": {
           "parts": [
@@ -83,9 +83,9 @@
         "actionType": "action",
         "cost": [],
         "uses": {
-          "value": null,
-          "max": "",
-          "recovery": null
+          "value": 0,
+          "max": "1",
+          "recovery": "longRest"
         },
         "effects": [
           {
@@ -110,8 +110,8 @@
         "actionType": "action",
         "cost": [],
         "uses": {
-          "value": null,
-          "max": "",
+          "value": 0,
+          "max": "1",
           "recovery": "longRest"
         },
         "damage": {
@@ -228,8 +228,8 @@
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1754174646194,
-    "modifiedTime": 1754236401349,
-    "lastModifiedBy": "LgnbNMLaxandgMQq"
+    "modifiedTime": 1754475491670,
+    "lastModifiedBy": "MQSznptE5yLT7kj8"
   },
   "ownership": {
     "default": 0,
diff --git a/src/packs/subclasses/feature_Loyal_Friend_xjZHD5Yo3Tu26rLm.json b/src/packs/subclasses/feature_Loyal_Friend_xjZHD5Yo3Tu26rLm.json
index 55d09063..5f8c3ed7 100644
--- a/src/packs/subclasses/feature_Loyal_Friend_xjZHD5Yo3Tu26rLm.json
+++ b/src/packs/subclasses/feature_Loyal_Friend_xjZHD5Yo3Tu26rLm.json
@@ -7,7 +7,31 @@
   "system": {
     "description": "<p>Once per long rest, when the damage from an attack would mark your companion’s last Stress or your last Hit Point and you’re within Close range of each other, you or your companion can rush to the other’s side and take that damage instead.</p>",
     "resource": null,
-    "actions": {},
+    "actions": {
+      "Z82YQzYWo4eektMa": {
+        "type": "effect",
+        "_id": "Z82YQzYWo4eektMa",
+        "systemPath": "actions",
+        "description": "<p>Once per long rest, when the damage from an attack would mark your companion’s last Stress or your last Hit Point and you’re within Close range of each other, you or your companion can rush to the other’s side and take that damage instead.</p>",
+        "chatDisplay": true,
+        "actionType": "action",
+        "cost": [],
+        "uses": {
+          "value": null,
+          "max": "1",
+          "recovery": "longRest",
+          "consumeOnSuccess": false
+        },
+        "effects": [],
+        "target": {
+          "type": "any",
+          "amount": null
+        },
+        "name": "Rush",
+        "img": "icons/creatures/mammals/humanoid-wolf-dog-blue.webp",
+        "range": "close"
+      }
+    },
     "originItemType": null,
     "originId": null
   },
@@ -26,8 +50,8 @@
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1754267956703,
-    "modifiedTime": 1754267994139,
-    "lastModifiedBy": "LgnbNMLaxandgMQq"
+    "modifiedTime": 1754496703770,
+    "lastModifiedBy": "MQSznptE5yLT7kj8"
   },
   "_key": "!items!xjZHD5Yo3Tu26rLm"
 }
diff --git a/src/packs/subclasses/feature_Rousing_Speech_PCmYTX02JLzBpgml.json b/src/packs/subclasses/feature_Rousing_Speech_PCmYTX02JLzBpgml.json
index b9f7dab7..312e055b 100644
--- a/src/packs/subclasses/feature_Rousing_Speech_PCmYTX02JLzBpgml.json
+++ b/src/packs/subclasses/feature_Rousing_Speech_PCmYTX02JLzBpgml.json
@@ -5,15 +5,7 @@
   "img": "icons/tools/instruments/megaphone.webp",
   "system": {
     "description": "<p><strong>Once per long rest</strong>, you can give a heartfelt, inspiring speech. <strong>All allies</strong> within <strong>Far</strong> range <strong>clear 2 Stress</strong>.</p>",
-    "resource": {
-      "type": "simple",
-      "value": 1,
-      "max": "1",
-      "icon": "",
-      "recovery": "longRest",
-      "diceStates": {},
-      "dieFaces": "d4"
-    },
+    "resource": null,
     "actions": {
       "WNtHiko4DRGbxKnm": {
         "type": "healing",
@@ -25,15 +17,16 @@
         "cost": [
           {
             "scalable": false,
-            "key": "iLytX899psvrPRnG",
+            "key": "hitPoints",
             "value": 1,
-            "keyIsID": true,
-            "step": null
+            "keyIsID": false,
+            "step": null,
+            "consumeOnSuccess": false
           }
         ],
         "uses": {
           "value": null,
-          "max": "",
+          "max": "1",
           "recovery": "longRest"
         },
         "damage": {
@@ -104,8 +97,8 @@
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1754174646194,
-    "modifiedTime": 1754236406644,
-    "lastModifiedBy": "LgnbNMLaxandgMQq"
+    "modifiedTime": 1754494763682,
+    "lastModifiedBy": "MQSznptE5yLT7kj8"
   },
   "ownership": {
     "default": 0,
diff --git a/src/packs/subclasses/feature_Sparing_Touch_GfOSgVJW8bS1OjNq.json b/src/packs/subclasses/feature_Sparing_Touch_GfOSgVJW8bS1OjNq.json
index 832b5532..6be97836 100644
--- a/src/packs/subclasses/feature_Sparing_Touch_GfOSgVJW8bS1OjNq.json
+++ b/src/packs/subclasses/feature_Sparing_Touch_GfOSgVJW8bS1OjNq.json
@@ -8,9 +8,10 @@
     "description": "<p>Once per long rest, touch a creature and clear 2 Hit Points or 2 Stress from them.</p>",
     "resource": {
       "type": "simple",
-      "value": 0,
+      "value": 1,
+      "progression": "decreasing",
       "max": "1",
-      "icon": "",
+      "icon": "fa-solid fa-hands-praying",
       "recovery": "longRest"
     },
     "actions": {
@@ -69,7 +70,7 @@
         },
         "target": {
           "type": "any",
-          "amount": null
+          "amount": 1
         },
         "effects": [],
         "roll": {
@@ -98,7 +99,16 @@
         "description": "<p><span style=\"color: rgb(239, 230, 216); font-family: Montserrat, sans-serif; font-size: 14px; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; white-space: normal; background-color: rgba(24, 22, 46, 0.376); text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial; display: inline !important; float: none\">Once per long rest, touch a creature and clear 2 Hit Points or 2 Stress from them.</span></p>",
         "chatDisplay": true,
         "actionType": "action",
-        "cost": [],
+        "cost": [
+          {
+            "scalable": false,
+            "key": "GfOSgVJW8bS1OjNq",
+            "value": 1,
+            "keyIsID": true,
+            "step": null,
+            "consumeOnSuccess": false
+          }
+        ],
         "uses": {
           "value": null,
           "max": "",
@@ -137,7 +147,7 @@
         },
         "target": {
           "type": "any",
-          "amount": null
+          "amount": 1
         },
         "effects": [],
         "roll": {
@@ -178,8 +188,8 @@
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1754353243691,
-    "modifiedTime": 1754353387422,
-    "lastModifiedBy": "Q9NoTaEarn3VMS6Z"
+    "modifiedTime": 1754496873264,
+    "lastModifiedBy": "MQSznptE5yLT7kj8"
   },
   "_key": "!items!GfOSgVJW8bS1OjNq"
 }
diff --git a/src/packs/subclasses/feature_Warden_s_Protection_2F1bUFY80oce97C9.json b/src/packs/subclasses/feature_Warden_s_Protection_2F1bUFY80oce97C9.json
index b681d64e..3d6055d2 100644
--- a/src/packs/subclasses/feature_Warden_s_Protection_2F1bUFY80oce97C9.json
+++ b/src/packs/subclasses/feature_Warden_s_Protection_2F1bUFY80oce97C9.json
@@ -6,13 +6,7 @@
   "img": "icons/magic/nature/barrier-shield-wood-vines.webp",
   "system": {
     "description": "<p>Once per long rest, spend 2 Hope to clear 2 Hit Points on 1d4 allies within Close range.</p>",
-    "resource": {
-      "type": "simple",
-      "value": 1,
-      "max": "1",
-      "icon": "",
-      "recovery": "longRest"
-    },
+    "resource": null,
     "actions": {
       "ozYzhQfRt5sp19di": {
         "type": "healing",
@@ -23,7 +17,7 @@
         "actionType": "action",
         "cost": [],
         "uses": {
-          "value": null,
+          "value": 0,
           "max": "1",
           "recovery": "longRest",
           "consumeOnSuccess": false
@@ -101,7 +95,7 @@
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1754183079986,
-    "modifiedTime": 1754353582707,
+    "modifiedTime": 1754496541966,
     "lastModifiedBy": "MQSznptE5yLT7kj8"
   },
   "_key": "!items!2F1bUFY80oce97C9"