diff --git a/test.js b/test.js
index 7012970..7c8e5a1 100644
--- a/test.js
+++ b/test.js
@@ -21,8 +21,6 @@ let armorTypes = [ "helmet", "chestplate", "leggings", "boots" ];
 let accessoryTypes = [ "ring", "bracelet", "necklace" ];
 let weaponTypes = [ "wand", "spear", "bow", "dagger", "relik" ];
 let item_fields = [ "name", "displayName", "tier", "set", "slots", "type", "material", "drop", "quest", "restrict", "nDam", "fDam", "wDam", "aDam", "tDam", "eDam", "atkSpd", "hp", "fDef", "wDef", "aDef", "tDef", "eDef", "lvl", "classReq", "strReq", "dexReq", "intReq", "agiReq", "defReq", "hprPct", "mr", "sdPct", "mdPct", "ls", "ms", "xpb", "lb", "ref", "str", "dex", "int", "agi", "def", "thorns", "exploding", "spd", "atkTier", "poison", "hpBonus", "spRegen", "eSteal", "hprRaw", "sdRaw", "mdRaw", "fDamPct", "wDamPct", "aDamPct", "tDamPct", "eDamPct", "fDefPct", "wDefPct", "aDefPct", "tDefPct", "eDefPct", "fixID", "category", "spPct1", "spRaw1", "spPct2", "spRaw2", "spPct3", "spRaw3", "spPct4", "spRaw4", "rainbowRaw", "sprint", "sprintReg", "jh", "lq", "gXp", "gSpd", "id" ];
-let nonRolledIDs = ["name", "displayName", "tier", "set", "slots", "type", "material", "drop", "quest", "restrict", "nDam", "fDam", "wDam", "aDam", "tDam", "eDam", "atkSpd", "hp", "fDef", "wDef", "aDef", "tDef", "eDef", "lvl", "classReq", "strReq", "dexReq", "intReq", "agiReq", "defReq","str", "dex", "int", "agi", "def", "fixID", "category", "id"];
-let rolledIDs = ["hprPct", "mr", "sdPct", "mdPct", "ls", "ms", "xpb", "lb", "ref", "thorns", "exploding", "spd", "atkTier", "poison", "hpBonus", "spRegen", "eSteal", "hprRaw", "sdRaw", "mdRaw", "fDamPct", "wDamPct", "aDamPct", "tDamPct", "eDamPct", "fDefPct", "wDefPct", "aDefPct", "tDefPct", "eDefPct", "spPct1", "spRaw1", "spPct2", "spRaw2", "spPct3", "spRaw3", "spPct4", "spRaw4", "rainbowRaw", "sprint", "sprintReg", "jh", "lq", "gXp", "gSpd"];
 let itemTypes = armorTypes.concat(accessoryTypes).concat(weaponTypes);
 let itemLists = new Map();
 for (const it of itemTypes) {
@@ -72,6 +70,8 @@ function init() {
         item.skillpoints = [0, 0, 0, 0, 0];
         item.has_negstat = false;
         item.reqs = [0, 0, 0, 0, 0];
+        item.fixID = true;
+        item.tier = " ";//do not get rid of this @hpp
         item.id = 10000 + i;
 
         noneItems[i] = item;
@@ -280,104 +280,25 @@ function calculateBuild(){
 
     setHTML("summary-box", "Summary: Assigned "+player_build.assigned_skillpoints+" skillpoints.");
 
-    setHTML("build-helmet", expandedItemToString(expandItem(player_build.helmet)));
-    setHTML("build-chestplate", expandedItemToString(expandItem(player_build.chestplate)));
-    setHTML("build-leggings", expandedItemToString(expandItem(player_build.leggings)));
-    setHTML("build-boots", expandedItemToString(expandItem(player_build.boots)));
-    setHTML("build-ring1", expandedItemToString(expandItem(player_build.ring1)));
-    setHTML("build-ring2", expandedItemToString(expandItem(player_build.ring2)));
-    setHTML("build-bracelet", expandedItemToString(expandItem(player_build.bracelet)));
-    setHTML("build-necklace", expandedItemToString(expandItem(player_build.necklace)));
-    setHTML("build-weapon", expandedItemToString(expandItem(player_build.weapon)));
-
+    displayExpandedItem(expandItem(player_build.helmet), "build-helmet");
+    displayExpandedItem(expandItem(player_build.chestplate), "build-chestplate");
+    displayExpandedItem(expandItem(player_build.leggings), "build-leggings");
+    displayExpandedItem(expandItem(player_build.boots), "build-boots");
+    displayExpandedItem(expandItem(player_build.ring1), "build-ring1");
+    displayExpandedItem(expandItem(player_build.ring2), "build-ring2");
+    displayExpandedItem(expandItem(player_build.bracelet), "build-bracelet");
+    displayExpandedItem(expandItem(player_build.necklace), "build-necklace");
+    displayExpandedItem(expandItem(player_build.weapon), "build-weapon");
+    //setHTML("build-cumulative-stats", player_build.getMeleeDPS()); //Incomplete function
     location.hash = encodeBuild();
 }
 /*  Helper function that gets stats ranges for wearable items.
     @param item - an item in Object format.
 */
-function expandItem(item){
-    let minRolls = new Map();
-    let maxRolls = new Map();
-    let expandedItem = new Map();
-    if(item.fixID){ //The item has fixed IDs.
-        expandedItem.set("fixID",true);
-        for (const id in rolledIDs){ //all rolled IDs are numerical
-            if(item[rolledIDs[id]]){
-                minRolls.set(rolledIDs[id],item[rolledIDs[id]]);
-                maxRolls.set(rolledIDs[id],item[rolledIDs[id]]);
-            }
-        }
-        for (id in nonRolledIDs){
-            if(item[nonRolledIDs[id]]){
-                expandedItem.set(nonRolledIDs[id],item[nonRolledIDs[id]]);
-            }
-        }
-    }else{ //The item does not have fixed IDs.
-        for (const id in rolledIDs){
-            console.log(id);
-            if(item[rolledIDs[id]]){
-                if(item[rolledIDs[id]] > 0){ // positive rolled IDs                   
-                    minRolls.set(rolledIDs[id],idRound(item[rolledIDs[id]]*0.3));
-                    maxRolls.set(rolledIDs[id],idRound(item[rolledIDs[id]]*1.3));
-                }else if(item[rolledIDs[id]] < 0){ //negative rolled IDs
-                    minRolls.set(rolledIDs[id],idRound(item[rolledIDs[id]]*1.3));
-                    maxRolls.set(rolledIDs[id],idRound(item[rolledIDs[id]]*0.7));
-                }else{//Id = 0
-                    minRolls.set(rolledIDs[id],0);
-                    maxRolls.set(rolledIDs[id],0);
-                }
-            }
-        }
-        for (const id in nonRolledIDs){
-            if(item[nonRolledIDs[id]]){
-                expandedItem.set(nonRolledIDs[id],item[nonRolledIDs[id]]);
-            }
-        }
-    }
-    expandedItem.set("minRolls",minRolls);
-    expandedItem.set("maxRolls",maxRolls);
-    console.log(expandedItem)
-    return expandedItem;
-}
 /*  A second helper function that takes items from expandItem() and stringifies them.
     @param item - a map with non-rolled Ids as normal key:value pairs and all rolled IDs as 2 separate key:value pairs in the minRoll and maxRoll keys that are mapped to maps.
     TODO: write the function
 */
-function expandedItemToString(item){
-    console.log(item);
-    let ids = ["lvl", "classReq","strReq", "dexReq", "intReq", "defReq","agiReq", "nDam", "eDam", "tDam", "wDam", "tDam", "aDam", "atkSpd", "hp", "eDef", "tDef", "wDef", "fDef", "aDef", "str", "dex", "int", "agi", "def", "hpBonus", "hprRaw", "hprPct", "sdRaw", "sdPct", "mdRaw", "mdPct", "mr", "ms", "ref", "ls", "poison", "thorns", "exploding", "spd", "atkTier",  "eDamPct", "tDamPct", "wDamPct", "fDamPct", "aDamPct", "eDefPct", "tDefPct", "wDefPct", "fDefPct", "aDefPct", "spPct1", "spRaw1", "spPct2", "spRaw2", "spPct3", "spRaw3", "spPct4", "spRaw4", "rainbowRaw", "sprint", "sprintReg", "jh", "xpb", "lb", "lq", "spRegen", "eSteal", "gXp", "gSpd", "slots", "set", "quest", "restrict"];
-    let idPrefixes = {"lvl":"Combat Level Min: ", "classReq":"Class Req: ","strReq":"Strength Min: ","dexReq":"Dexterity Min: ","intReq":"Intelligence Min: ","defReq":"Defense Min: ","agiReq":"Agility Min: ", "nDam":"Neutral Damage: ", "eDam":"Earth Damage: ", "tDam":"Thunder Damage: ", "wDam":"Water Damage: ", "fDam":"Fire Damage: ", "aDam":"Air Damage: ", "atkSpd":"Attack Speed: ", "hp":"Health: ", "eDef":"Earth Defense: ", "tDef":"Thunder Defense: ", "wDef":"Water Defense: ", "fDef":"Fire Defense: ", "aDef":"Air Defense: ", "str":"Strength: ", "dex":"Dexterity: ", "int":"Intelligence: ", "def":"Defense: ","agi":"Agility: ", "hpBonus":"Health Bonus: ", "hprRaw":"Health Regen Raw: ", "hprPct":"Health Regen %: ", "sdRaw":"Raw Spell Damage: ", "sdPct":"Spell Damage %: ", "mdRaw":"Main Attack Neutral Damage: ", "mdPct":"Main Attack Damage %: ", "mr":"Mana Regen: ", "ms":"Mana Steal: ", "ref":"Reflection: ", "ls":"Life Steal: ", "poison":"Poison: ", "thorns":"Thorns: ", "exploding":"Expoding: ", "spd":"Walk Speed Bonus: ", "atkTier":"Attack Speed Bonus: ",  "eDamPct":"Earth Damage %: ", "tDamPct":"Thunder Damage %: ", "wDamPct":"Water Damage %: ", "fDamPct":"Fire Damage %: ", "aDamPct":"Air Damage %: ", "eDefPct":"Earth Defense %: ", "tDefPct":"Thunder Defense %: ", "wDefPct":"Water Defense %: ", "fDefPct":"Fire Defense %: ", "aDefPct":"Air Defense %: ", "spPct1":"1st Spell Cost %: ", "spRaw1":"1st Spell Cost Raw: ", "spPct2":"2nd Spell Cost %: ", "spRaw2":"2nd Spell Cost Raw: ", "spPct3":"3rd Spell Cost %: ", "spRaw3":"3rd Spell Cost Raw: ", "spPct4":"4th Spell Cost %: ", "spRaw4":"4th Spell Cost Raw: ", "rainbowRaw":"Rainbow Spell Damage Raw: ", "sprint":"Sprint Bonus: ", "sprintReg":"Sprint Regen Bonus: ", "jh":"Jump Height: ", "xpb":"Combat XP Bonus: ", "lb":"Loot Bonus: ", "lq":"Loot Quality: ", "spRegen":"Soul Point Regen: ", "eSteal":"Stealing: ", "gXp":"Gathering XP Bonus: ", "gSpd":"Gathering Speed Bonus: ", "slots":"Powder Slots: ", "set":"This item belongs to the ", "quest":"This item is from the quest<br>", "restrict":""};
-    let idSuffixes = {"lvl":"", "classReq":"","strReq":"","dexReq":"","intReq":"","defReq":"","agiReq":"", "nDam":"", "eDam":"", "tDam":"", "wDam":"", "fDam":"", "aDam":"", "atkSpd":"", "hp":"", "eDef":"", "tDef":"", "wDef":"", "fDef":"", "aDef":"", "str":"", "dex":"", "int":"", "def":"","agi":"", "hpBonus":"", "hprRaw":"", "hprPct":"%", "sdRaw":"", "sdPct":"%", "mdRaw":"", "mdPct":"%", "mr":"/4s", "ms":"/4s", "ref":"%", "ls":"/4s", "poison":"/3s", "thorns":"%", "exploding":"%", "spd":"%", "atkTier":" tier",  "eDamPct":"%", "tDamPct":"%", "wDamPct":"%", "fDamPct":"%", "aDamPct":"%", "eDefPct":"%", "tDefPct":"%", "wDefPct":"%", "fDefPct":"%", "aDefPct":"%", "spPct1":"%", "spRaw1":"", "spPct2":"%", "spRaw2":"", "spPct3":"%", "spRaw3":"", "spPct4":"%", "spRaw4":"", "rainbowRaw":"", "sprint":"%", "sprintReg":"%", "jh":"", "xpb":"%", "lb":"%", "lq":"%", "spRegen":"%", "eSteal":"%", "gXp":"%", "gSpd":"%", "slots":"", "set":" set.", "quest":".", "restrict":""};
-    let itemString = "";
-    itemString = itemString.concat(item.get("name"),"<br><br>");
-    if(item.has("fixID") && item.get("fixID")){//fixed IDs
-        for(i = 0; i < ids.length; i++){ //iterate the ids
-            if(nonRolledIDs.includes(ids[i]) && item.get(ids[i])){//nonRolledID & non-0/non-null/non-und ID
-                itemString = itemString.concat(idPrefixes[ids[i]]);
-                itemString = itemString.concat(item.get(ids[i]), idSuffixes[ids[i]],"<br>");
-            }
-            if(rolledIDs.includes(ids[i])&& item.get("minRolls").get(ids[i]) && item.get("maxRolls").get(ids[i]) ){//rolled ID & non-0/non-null/non-und ID
-                console.log("hi");
-                itemString = itemString.concat(idPrefixes[ids[i]]);
-                itemString = itemString.concat(item.get("minRolls").get(ids[i]), idSuffixes[ids[i]],"<br>");
-            }//Just don't do anything if else
-        }
-    }else{//non-fixed IDs
-        for(i = 0; i < ids.length; i++){ //iterate the ids
-            if(nonRolledIDs.includes(ids[i]) && item.get(ids[i])){//nonRolledID & non-0/non-null/non-und ID
-                itemString = itemString.concat(idPrefixes[ids[i]]);
-                itemString = itemString.concat(item.get(ids[i]), idSuffixes[ids[i]],"<br>");
-            }
-            if(rolledIDs.includes(ids[i])&& item.get("minRolls").get(ids[i]) && item.get("maxRolls").get(ids[i]) ){//rolled ID & non-0/non-null/non-und ID
-                console.log("hi");
-                itemString = itemString.concat(idPrefixes[ids[i]]);
-                itemString = itemString.concat(item.get("minRolls").get(ids[i]), idSuffixes[ids[i]], " -> ", idRound(item.get("maxRolls").get(ids[i])),idSuffixes[ids[i]],"<br>");
-            }//Just don't do anything if else
-        }
-    }
-    itemString = itemString.concat("<br>",item.get("tier")," ", item.get("type"));
-    return itemString;
-}
 /*An independent helper function that rounds a rolled ID to the nearest integer OR brings the roll away from 0.
 * @param id
 */
@@ -390,6 +311,8 @@ function idRound(id){
     }
 }
 
+
+
 function resetFields(){
     setValue("helmet-choice", "");
     setValue("helmet-powder", "");
@@ -410,6 +333,8 @@ function resetFields(){
     setValue("int-skp", "0");
     setValue("def-skp", "0");
     setValue("agi-skp", "0");
+    location.hash = "";
 }
 
 load_init(init);
+