diff --git a/module/actor/actor-sheet.js b/module/actor/actor-sheet.js
index 38727c3..568fddf 100644
--- a/module/actor/actor-sheet.js
+++ b/module/actor/actor-sheet.js
@@ -102,11 +102,12 @@ export class MothershipActorSheet extends ActorSheet {
 
       if (i.type === 'item') {
         gear.push(i);
-        curWeight+=item.weight;
+        curWeight+=item.weight*item.quantity;
       } else if (i.type === 'skill') {
         skills.push(i);
       } else if (i.type === 'armor') {
         armors.push(i);
+        curWeight+=item.weight;
       } else if (i.type === 'weapon') {
         //We need to update this from the old system.    
         if(item.ranges.value == "" && item.ranges.medium > 0){
@@ -115,6 +116,7 @@ export class MothershipActorSheet extends ActorSheet {
         }
 
         weapons.push(i);
+        curWeight+=item.weight;
       } else if (i.type === 'condition') {
         // We'll handle the pip html here.
         if (item.treatment == null) {
diff --git a/template.json b/template.json
index b14cabe..eb3945e 100644
--- a/template.json
+++ b/template.json
@@ -240,6 +240,7 @@
       "critDmg": "",
       "critEffect": "",
       "bonus": 0,
+      "weight": 0,
       "cost" : 0,
       "ranges": {
         "short": 0,
@@ -255,7 +256,9 @@
       "templates": [
         "base"
       ],
-      "bonus": 10
+      "bonus": 10,
+      "weight": 0,
+      "cost" : 0
     },
     "condition": {
       "templates": [
diff --git a/templates/item/item-armor-sheet.html b/templates/item/item-armor-sheet.html
index cc96d0b..25dd90a 100644
--- a/templates/item/item-armor-sheet.html
+++ b/templates/item/item-armor-sheet.html
@@ -23,7 +23,7 @@
     {{!-- Sheet Tab Navigation --}}
     <nav class="sheet-tabs tabs" data-group="primary">
         <a class="item" data-tab="description">Description</a>
-        <!-- <a class="item" data-tab="attributes">Attributes</a> -->
+        <a class="item" data-tab="item">Item</a> 
     </nav>
 
     {{!-- Sheet Body --}}
@@ -34,9 +34,18 @@
             {{editor content=data.description target="data.description" button=true owner=owner editable=true}}
         </div>
 
-        {{!-- Attributes Tab --}}
-        <div class="tab attributes" data-group="primary" data-tab="attributes">
-            {{!-- As you add new fields, add them in here! --}}
+        {{!-- Item Tab --}}
+        <div class="tab ranges" data-group="primary" data-tab="item">
+            <div class="grid grid-3col">
+                <div class="resource">
+                    <label class="resource-label">Value</label>
+                    <input type="text" name="data.cost" value="{{data.cost}}" data-dtype="Number" />
+                </div>
+                <div class="resource">
+                    <label class="resource-label">Weight</label>
+                    <input type="text" name="data.weight" value="{{data.weight}}" data-dtype="Number" />
+                </div>
+            </div>
         </div>
     </section>
 </form>