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 0fccb3f..eb3945e 100644
--- a/template.json
+++ b/template.json
@@ -240,6 +240,7 @@
       "critDmg": "",
       "critEffect": "",
       "bonus": 0,
+      "weight": 0,
       "cost" : 0,
       "ranges": {
         "short": 0,
@@ -256,7 +257,8 @@
         "base"
       ],
       "bonus": 10,
-      "value" : 0
+      "weight": 0,
+      "cost" : 0
     },
     "condition": {
       "templates": [