diff --git a/lang/en.json b/lang/en.json
index 2beb8db6..7165297f 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -700,6 +700,8 @@
                 "feature": "Feature"
             },
             "ItemArmor":{
+                "toggleTitle":"Armor Resource?",
+                "settingTitle":"Armor",
                 "title":"Armor Properties",
                 "value":"Value",
                 "max":"Max",
diff --git a/module/data/item/consumable.mjs b/module/data/item/consumable.mjs
index ac09d029..924b2605 100644
--- a/module/data/item/consumable.mjs
+++ b/module/data/item/consumable.mjs
@@ -1,4 +1,5 @@
 import BaseDataItem from './base.mjs';
+import { armorPriorityKeys } from "../../config/itemConfig.mjs";
 
 export default class DHConsumable extends BaseDataItem {
     /** @inheritDoc */
@@ -24,9 +25,10 @@ export default class DHConsumable extends BaseDataItem {
                 max: new fields.NumberField({ required: true, integer: true, min: 0, initial: 0}),
                 priority: new fields.StringField({
                     required: true,
-                    choices: CONFIG.DH.ITEM.allArmorKeys,
-                    initial: CONFIG.DH.ITEM.armorPriorityKeys[0]
-                })
+                    choices: armorPriorityKeys,
+                    initial: 'armor'
+                }),
+                armorResourceToggle: new fields.BooleanField({initial: false})
             }),
             //End
             consumeOnUse: new fields.BooleanField({ initial: true }),
diff --git a/module/data/item/loot.mjs b/module/data/item/loot.mjs
index d8f6ff26..eed506e9 100644
--- a/module/data/item/loot.mjs
+++ b/module/data/item/loot.mjs
@@ -1,4 +1,5 @@
 import BaseDataItem from './base.mjs';
+import { armorPriorityKeys } from "../../config/itemConfig.mjs";
 
 export default class DHLoot extends BaseDataItem {
     /** @inheritDoc */
@@ -15,8 +16,21 @@ export default class DHLoot extends BaseDataItem {
 
     /** @inheritDoc */
     static defineSchema() {
+        const fields = foundry.data.fields;
         return {
             ...super.defineSchema(),
+            //Testing new armor schema
+            armor: new fields.SchemaField({
+                value: new fields.NumberField({integer: true, min: 0, initial: 0}),
+                max: new fields.NumberField({ required: true, integer: true, min: 0, initial: 0}),
+                priority: new fields.StringField({
+                    required: true,
+                    choices: armorPriorityKeys,
+                    initial: 'armor'
+                }),
+                armorResourceToggle: new fields.BooleanField({initial: false})
+            }),
+            //End
         };
     }
 
diff --git a/module/data/item/weapon.mjs b/module/data/item/weapon.mjs
index 3aca1f79..ab5c4bda 100644
--- a/module/data/item/weapon.mjs
+++ b/module/data/item/weapon.mjs
@@ -1,5 +1,6 @@
 import AttachableItem from './attachableItem.mjs';
 import { ActionField } from '../fields/actionField.mjs';
+import { armorPriorityKeys } from "../../config/itemConfig.mjs";
 
 export default class DHWeapon extends AttachableItem {
     /** @inheritDoc */
@@ -24,9 +25,10 @@ export default class DHWeapon extends AttachableItem {
                 max: new fields.NumberField({ required: true, integer: true, min: 0, initial: 0}),
                 priority: new fields.StringField({
                     required: true,
-                    choices: CONFIG.DH.ITEM.allArmorKeys,
-                    initial: CONFIG.DH.ITEM.armorPriorityKeys[0]
-                })
+                    choices: armorPriorityKeys,
+                    initial: 'armor'
+                }),
+                armorResourceToggle: new fields.BooleanField({initial: false})
             }),
             //End
             tier: new fields.NumberField({
diff --git a/templates/sheets/items/consumable/settings.hbs b/templates/sheets/items/consumable/settings.hbs
index 7cc75f6f..2e3490ab 100644
--- a/templates/sheets/items/consumable/settings.hbs
+++ b/templates/sheets/items/consumable/settings.hbs
@@ -14,4 +14,25 @@
         <span>{{localize "DAGGERHEART.ITEMS.Consumable.destroyOnEmpty"}}</span>
         {{formField systemFields.destroyOnEmpty value=source.system.destroyOnEmpty}}
     </fieldset>
+    <fieldset class="two-columns">
+        <legend>{{localize "DAGGERHEART.CONFIG.ItemArmor.settingTitle"}}</legend>
+        <span>{{localize "DAGGERHEART.CONFIG.ItemArmor.toggleTitle"}}</span>
+        {{formField 
+            systemFields.armor.fields.armorResourceToggle 
+            value=source.system.armor.armorResourceToggle 
+        }}
+        {{#if source.system.armor.armorResourceToggle}}
+        <span>{{localize "DAGGERHEART.CONFIG.ItemArmor.title"}}</span>
+        <div class="nest-inputs">
+            {{formField systemFields.armor.fields.value value=source.system.armor.value label=(localize "DAGGERHEART.CONFIG.ItemArmor.value")}}
+            {{formField systemFields.armor.fields.max value=source.system.armor.max label=(localize "DAGGERHEART.CONFIG.ItemArmor.max")}}
+            {{formField 
+            systemFields.armor.fields.priority 
+            value=source.system.armor.priority 
+            label=(localize "DAGGERHEART.CONFIG.ItemArmor.priority")
+            localize=true
+            }}
+        </div>
+        {{/if}}
+    </fieldset>
 </section>
\ No newline at end of file
diff --git a/templates/sheets/items/loot/settings.hbs b/templates/sheets/items/loot/settings.hbs
index e853c1db..e25c5f98 100644
--- a/templates/sheets/items/loot/settings.hbs
+++ b/templates/sheets/items/loot/settings.hbs
@@ -8,4 +8,25 @@
         <span>{{localize "DAGGERHEART.GENERAL.quantity"}}</span>
         {{formField systemFields.quantity value=source.system.quantity}}
     </fieldset>
+    <fieldset class="two-columns">
+        <legend>{{localize "DAGGERHEART.CONFIG.ItemArmor.settingTitle"}}</legend>
+        <span>{{localize "DAGGERHEART.CONFIG.ItemArmor.toggleTitle"}}</span>
+        {{formField 
+            systemFields.armor.fields.armorResourceToggle 
+            value=source.system.armor.armorResourceToggle 
+        }}
+        {{#if source.system.armor.armorResourceToggle}}
+        <span>{{localize "DAGGERHEART.CONFIG.ItemArmor.title"}}</span>
+        <div class="nest-inputs">
+            {{formField systemFields.armor.fields.value value=source.system.armor.value label=(localize "DAGGERHEART.CONFIG.ItemArmor.value")}}
+            {{formField systemFields.armor.fields.max value=source.system.armor.max label=(localize "DAGGERHEART.CONFIG.ItemArmor.max")}}
+            {{formField 
+            systemFields.armor.fields.priority 
+            value=source.system.armor.priority 
+            label=(localize "DAGGERHEART.CONFIG.ItemArmor.priority")
+            localize=true
+            }}
+        </div>
+        {{/if}}
+    </fieldset>
 </section>
\ No newline at end of file
diff --git a/templates/sheets/items/weapon/settings.hbs b/templates/sheets/items/weapon/settings.hbs
index f9499221..3a579ac5 100644
--- a/templates/sheets/items/weapon/settings.hbs
+++ b/templates/sheets/items/weapon/settings.hbs
@@ -45,4 +45,25 @@
         <span>{{localize "TYPES.Item.feature"}}</span>
         <input type="text" class="features-input" value="{{features}}" />
     </fieldset>
+    <fieldset class="two-columns">
+        <legend>{{localize "DAGGERHEART.CONFIG.ItemArmor.settingTitle"}}</legend>
+        <span>{{localize "DAGGERHEART.CONFIG.ItemArmor.toggleTitle"}}</span>
+        {{formField 
+            systemFields.armor.fields.armorResourceToggle 
+            value=source.system.armor.armorResourceToggle 
+        }}
+        {{#if source.system.armor.armorResourceToggle}}
+        <span>{{localize "DAGGERHEART.CONFIG.ItemArmor.title"}}</span>
+        <div class="nest-inputs">
+            {{formField systemFields.armor.fields.value value=source.system.armor.value label=(localize "DAGGERHEART.CONFIG.ItemArmor.value")}}
+            {{formField systemFields.armor.fields.max value=source.system.armor.max label=(localize "DAGGERHEART.CONFIG.ItemArmor.max")}}
+            {{formField 
+            systemFields.armor.fields.priority 
+            value=source.system.armor.priority 
+            label=(localize "DAGGERHEART.CONFIG.ItemArmor.priority")
+            localize=true
+            }}
+        </div>
+        {{/if}}
+    </fieldset>
 </section>
\ No newline at end of file