diff --git a/module/actor/actor-sheet.js b/module/actor/actor-sheet.js
index 71085ae..0dafc5b 100644
--- a/module/actor/actor-sheet.js
+++ b/module/actor/actor-sheet.js
@@ -50,13 +50,24 @@ export class DeltaGreenActorSheet extends ActorSheet {
   }
 
   /** @override */
-  getData() {
+  async getData() {
     const data = super.getData();
 
     // Prepare items.
     if (this.actor.type == 'agent') {
       this._prepareCharacterItems(data);
     }
+
+    switch (this.actor.type) {
+      case "agent":
+        data.enrichedDescription = await TextEditor.enrichHTML(this.object.system.physicalDescription, {async: true});
+        break;
+      case "npc":
+      case "unnatural":
+        data.enrichedDescription = await TextEditor.enrichHTML(this.object.system.notes, {async: true});
+        break;
+      default:
+    }
     
     return data;
   }
@@ -78,7 +89,7 @@ export class DeltaGreenActorSheet extends ActorSheet {
     // Iterate through items, allocating to containers
     // let totalWeight = 0;
     for (let i of sheetData.items) {
-      let item = i.data;
+      let item = i;
       i.img = i.img || DEFAULT_TOKEN;
       // Append to armor.
       if (i.type === 'armor') {
@@ -211,9 +222,9 @@ export class DeltaGreenActorSheet extends ActorSheet {
       event.preventDefault();
       let currentBreakingPoint = 0;
     
-      currentBreakingPoint = this.actor.data.data.sanity.value - this.actor.data.data.statistics.pow.value;
+      currentBreakingPoint = this.actor.system.sanity.value - this.actor.system.statistics.pow.value;
       
-      let updatedData = duplicate(this.actor.data.data);
+      let updatedData = duplicate(this.actor.system);
       updatedData.sanity.currentBreakingPoint = currentBreakingPoint;
       this.actor.update({"data": updatedData});
     });
@@ -230,8 +241,8 @@ export class DeltaGreenActorSheet extends ActorSheet {
 
       event.preventDefault();
       let targetskill = event.target.getAttribute("data-typedskill");
-      let existingLabel = this.actor.data.data.typedSkills[targetskill].label;
-      let existingGroup = this.actor.data.data.typedSkills[targetskill].group;
+      let existingLabel = this.actor.system.typedSkills[targetskill].label;
+      let existingGroup = this.actor.system.typedSkills[targetskill].group;
 
       //this.actor.update({[`data.typedSkills.${targetskill}.label`]: 'test'});
 
@@ -245,7 +256,7 @@ export class DeltaGreenActorSheet extends ActorSheet {
       let targetskill = event.target.getAttribute("data-typedskill");
 
       // many bothans died to bring us this information on how to delete a property on an entity
-      this.actor.update({[`data.typedSkills.-=${targetskill}`]: null});
+      this.actor.update({[`system.typedSkills.-=${targetskill}`]: null});
 
     });
 
@@ -399,7 +410,7 @@ export class DeltaGreenActorSheet extends ActorSheet {
   }
 
   _addNewTypedSkill(newSkillLabel, newSkillGroup){
-    let updatedData = duplicate(this.actor.data.data);
+    let updatedData = duplicate(this.actor.system);
     let typedSkills = updatedData.typedSkills;
 
     let d = new Date();
@@ -416,7 +427,7 @@ export class DeltaGreenActorSheet extends ActorSheet {
   _updateTypedSkill(targetSkill, newSkillLabel, newSkillGroup){
 
     if(newSkillLabel !== null && newSkillLabel !== "" && newSkillGroup !== null & newSkillGroup !== ""){
-      let updatedData = duplicate(this.actor.data.data);
+      let updatedData = duplicate(this.actor.system);
     
       updatedData.typedSkills[targetSkill].label = newSkillLabel;
       updatedData.typedSkills[targetSkill].group = newSkillGroup;
@@ -436,8 +447,10 @@ export class DeltaGreenActorSheet extends ActorSheet {
     const header = event.currentTarget;
     // Get the type of item to create.
     const type = header.dataset.type;
+    
     // Grab any data associated with this control.
-    const data = duplicate(header.dataset);
+    //const system = duplicate(header.dataset); Not really sure what this was doing here. Seems unnecessary.
+    
     // Initialize a default name.
     //const name = `New ${type.capitalize()}`;
     const name = game.i18n.localize("DG.ItemTypes.NewPrefix") + game.i18n.localize("DG.ItemTypes." + type)
@@ -445,22 +458,22 @@ export class DeltaGreenActorSheet extends ActorSheet {
     const itemData = {
       name: name,
       type: type,
-      data: data
+      system: {}
     };
 
     // Remove the type from the dataset since it's in the itemData.type prop.
-    delete itemData.data["type"];
+    // delete itemData.data["type"];
 
     if(type == "weapon"){
-      itemData.data.skill = "firearms"; //default skill to firearms, since that will be most common
-      itemData.data.expense = "Standard";
+      itemData.system.skill = "firearms"; //default skill to firearms, since that will be most common
+      itemData.system.expense = "Standard";
     }
     else if(type == "armor"){
-      itemData.data.armor = 3;
-      itemData.data.expense = "Standard";
+      itemData.system.armor = 3;
+      itemData.system.expense = "Standard";
     }
     else if(type == "bond"){
-      itemData.data.score = this.object.data.data.statistics.cha.value; // Can vary, but at character creation starting bond score is usually agent's charisma
+      itemData.system.score = this.object.system.statistics.cha.value; // Can vary, but at character creation starting bond score is usually agent's charisma
       itemData.img = "icons/svg/mystery-man.svg"
     }
     
@@ -509,40 +522,40 @@ export class DeltaGreenActorSheet extends ActorSheet {
         // otherwise roll a regular skill test
         if(targetVal === "dex"){
           label = game.i18n.localize("DG.Attributes.dex").toUpperCase() + "x5";
-          targetVal = this.actor.data.data.statistics.dex.x5;
+          targetVal = this.actor.system.statistics.dex.x5;
         }
         else if(targetVal === "int"){
           label = game.i18n.localize("DG.Attributes.int").toUpperCase() + "x5";
-          targetVal = this.actor.data.data.statistics.int.x5;
+          targetVal = this.actor.system.statistics.int.x5;
         }
         else if(targetVal === "str"){
           label = game.i18n.localize("DG.Attributes.str").toUpperCase() + "x5";
-          targetVal = this.actor.data.data.statistics.str.x5;
+          targetVal = this.actor.system.statistics.str.x5;
         }
         else if(targetVal === "con"){
           label = game.i18n.localize("DG.Attributes.con").toUpperCase() + "x5";
-          targetVal = this.actor.data.data.statistics.con.x5;
+          targetVal = this.actor.system.statistics.con.x5;
         }
         else if(targetVal === "pow"){
           label = game.i18n.localize("DG.Attributes.pow").toUpperCase() + "x5";
-          targetVal = this.actor.data.data.statistics.pow.x5;
+          targetVal = this.actor.system.statistics.pow.x5;
         }
         else if(targetVal === "cha"){
           label = game.i18n.localize("DG.Attributes.cha").toUpperCase() + "x5";
-          targetVal = this.actor.data.data.statistics.cha.x5;
+          targetVal = this.actor.system.statistics.cha.x5;
         }
         else{
           label = game.i18n.localize("DG.Skills." + targetVal).toUpperCase() + "x5";          
-          targetVal = this.actor.data.data.skills[targetVal].proficiency;                    
+          targetVal = this.actor.system.skills[targetVal].proficiency;                    
         }
       }
       else if(dataset.target === "statistic.x5"){
-        let stat = this.actor.data.data.statistics[key];
+        let stat = this.actor.system.statistics[key];
         targetVal = stat.x5;
         label = game.i18n.localize("DG.Attributes." + key).toUpperCase();
       }
       else if(rollType === "sanity"){
-        targetVal = this.actor.data.data.sanity.value;
+        targetVal = this.actor.system.sanity.value;
         label = game.i18n.localize("DG.Attributes.SAN").toUpperCase();
       }
       else if(rollType === "damage"){
@@ -562,7 +575,7 @@ export class DeltaGreenActorSheet extends ActorSheet {
         let skillType = dataset.skill ? dataset.skill : '';
 
         if(this.actor.type === 'agent' && (skillType === 'unarmed_combat' || skillType === 'melee_weapons')){
-          diceFormula += this.actor.data.data.statistics.str.meleeDamageBonusFormula;
+          diceFormula += this.actor.system.statistics.str.meleeDamageBonusFormula;
         }
         
         if(requestedModifyRoll){
@@ -594,13 +607,13 @@ export class DeltaGreenActorSheet extends ActorSheet {
 
     let currentBreakingPoint = 0;
     
-    currentBreakingPoint = this.actor.data.data.sanity.value - this.actor.data.data.statistics.pow.value;
+    currentBreakingPoint = this.actor.system.sanity.value - this.actor.system.statistics.pow.value;
 
     if(currentBreakingPoint < 0){
       currentBreakingPoint = 0;
     }
     
-    let updatedData = duplicate(this.actor.data.data);
+    let updatedData = duplicate(this.actor.system);
 
     updatedData.sanity.currentBreakingPoint = currentBreakingPoint;
 
@@ -615,7 +628,7 @@ export class DeltaGreenActorSheet extends ActorSheet {
     try{
       //const item = this.actor.getOwnedItem(dataset.id);
       const item = this.actor.items.get(dataset.id);
-      var isEquipped = item.data.data.equipped;
+      var isEquipped = item.system.equipped;
       isEquipped = !isEquipped;
       item.update({data:{equipped: isEquipped}});
     }
@@ -639,14 +652,14 @@ export class DeltaGreenActorSheet extends ActorSheet {
     if ( li.dataset.itemId ) {
       const item = this.actor.items.get(li.dataset.itemId);
       dragData.type = "Item";
-      dragData.data = item.data;
+      dragData = item;
     }
 
     // Active Effect
     if ( li.dataset.effectId ) {
       const effect = this.actor.effects.get(li.dataset.effectId);
       dragData.type = "ActiveEffect";
-      dragData.data = effect.data;
+      dragData = effect;
     }
 
     // Set data transfer
diff --git a/module/actor/actor.js b/module/actor/actor.js
index 66da155..c0f377f 100644
--- a/module/actor/actor.js
+++ b/module/actor/actor.js
@@ -11,9 +11,8 @@ export class DeltaGreenActor extends Actor {
     super.prepareData();
 
     const actorData = this;
-    //const actorData = this.data;
-    //const data = actorData.data;
-    //const flags = actorData.flags;
+    const system = actorData.system;
+    const flags = actorData.flags;
 
     //console.log('actor.js prepareData');
     //console.log(this);
@@ -59,48 +58,47 @@ export class DeltaGreenActor extends Actor {
   }
 
  _prepareNpcData(actor){
-  let actorData = actor.data;
-  const data = actorData.data;
+  const { system } = actor;
 
   // Loop through ability scores, and add their modifiers to our sheet output.
-  for (let [key, statistic] of Object.entries(data.statistics)) {
+  for (let [key, statistic] of Object.entries(system.statistics)) {
     // the x5 is just whatever the raw statistic is x 5 to turn it into a d100 percentile
     statistic.x5 = statistic.value * 5;
   }
 
   // initialize sanity, don't set these afterwards, as they need to be manually edited
-  if(actorData.data.sanity.value >= 100){
-    actorData.data.sanity.value = actorData.data.statistics.pow.x5
-    actorData.data.sanity.currentBreakingPoint = actorData.data.sanity.value - actorData.data.statistics.pow.value;
+  if(system.sanity.value >= 100){
+    system.sanity.value = system.statistics.pow.x5
+    system.sanity.currentBreakingPoint = system.sanity.value - system.statistics.pow.value;
   };
 
-  actorData.data.sanity.max = 99 - actorData.data.skills.unnatural.proficiency;
+  system.sanity.max = 99 - system.skills.unnatural.proficiency;
 
-  actorData.data.skills.ritual = {
+  system.skills.ritual = {
     label: "Ritual",
-    proficiency: 99 - actorData.data.sanity.value,
+    proficiency: 99 - system.sanity.value,
     cannotBeImprovedByFailure: true,
     failure: false
   };
 
-  if(actorData.data.skills.ritual.proficiency > 99){
-    actorData.data.skills.ritual.proficiency = 99
+  if(system.skills.ritual.proficiency > 99){
+    system.skills.ritual.proficiency = 99
   }
-  else if(actorData.data.skills.ritual.proficiency < 1){
-    actorData.data.skills.ritual.proficiency = 1
+  else if(system.skills.ritual.proficiency < 1){
+    system.skills.ritual.proficiency = 1
   }
 
   // calculate total armor rating
   let protection = 0;
   for (let i of actor.items) {
     if (i.type === 'armor') {
-      if(i.data.data.equipped === true){
-        protection += i.data.data.protection;
+      if(i.system.equipped === true){
+        protection += i.system.protection;
       }
     }
   }
 
-  actorData.data.health.protection = protection;
+  system.health.protection = protection;
 
   console.log(actor);
 }
@@ -110,11 +108,10 @@ export class DeltaGreenActor extends Actor {
    * @param {*} agent 
    */
   _prepareUnnaturalData(actor){
-    let actorData = actor.data;
-    const data = actorData.data;
+    const { system } = actor;
 
     // Loop through ability scores, and add their modifiers to our sheet output.
-    for (let [key, statistic] of Object.entries(data.statistics)) {
+    for (let [key, statistic] of Object.entries(system.statistics)) {
       // the x5 is just whatever the raw statistic is x 5 to turn it into a d100 percentile
       statistic.x5 = statistic.value * 5;
     }
@@ -123,13 +120,13 @@ export class DeltaGreenActor extends Actor {
     let protection = 0;
     for (let i of actor.items) {
       if (i.type === 'armor') {
-        if(i.data.data.equipped === true){
-          protection += i.data.data.protection;
+        if(i.system.equipped === true){
+          protection += i.system.protection;
         }
       }
     }
 
-    actorData.data.health.protection = protection;
+    system.health.protection = protection;
 
     console.log(actor);
   }
@@ -139,37 +136,36 @@ export class DeltaGreenActor extends Actor {
    */
   _prepareAgentData(agent) {
 
-    let actorData = agent.data;
-    const data = actorData.data;
+    const { system } = agent;
 
     // Make modifications to data here. For example:
 
     // Loop through ability scores, and add their modifiers to our sheet output.
-    for (let [key, statistic] of Object.entries(data.statistics)) {
+    for (let [key, statistic] of Object.entries(system.statistics)) {
       // the x5 is just whatever the raw statistic is x 5 to turn it into a d100 percentile
       statistic.x5 = statistic.value * 5;
     }
     
     // The ritual skill is from the Handler's Guide, it is for activating a ritual and is always equal to 99 - current sanity.
     // The rules can be found on page 166, under 'Ritual Activation'.
-    actorData.data.skills.ritual = {
+    system.skills.ritual = {
       label: "Ritual",
-      proficiency: 99 - actorData.data.sanity.value,
+      proficiency: 99 - system.sanity.value,
       cannotBeImprovedByFailure: true,
       failure: false
     };
 
-    if(actorData.data.skills.ritual.proficiency > 99){
-      actorData.data.skills.ritual.proficiency = 99
+    if(system.skills.ritual.proficiency > 99){
+      system.skills.ritual.proficiency = 99
     }
-    else if(actorData.data.skills.ritual.proficiency < 1){
-      actorData.data.skills.ritual.proficiency = 1
+    else if(system.skills.ritual.proficiency < 1){
+      system.skills.ritual.proficiency = 1
     }
 
     // The unnatural skill is sort of special
     // It cannot be improved via failure, so add in a special property to reflect this
     // Mostly to make it easy to deactivate the failure checkbox in the GUI
-    for (let [key, skill] of Object.entries(data.skills)){
+    for (let [key, skill] of Object.entries(system.skills)){
       if(key === 'unnatural'){
         skill.cannotBeImprovedByFailure = true;
       }
@@ -192,52 +188,52 @@ export class DeltaGreenActor extends Actor {
       }
     }
 
-    actorData.data.wp.max = actorData.data.statistics.pow.value;
+    system.wp.max = system.statistics.pow.value;
 
-    actorData.data.health.max = Math.ceil((actorData.data.statistics.con.value + actorData.data.statistics.str.value) / 2);
+    system.health.max = Math.ceil((system.statistics.con.value + system.statistics.str.value) / 2);
 
     // initialize sanity, don't set these afterwards, as they need to be manually edited
-    if(actorData.data.sanity.value >= 100){
-      actorData.data.sanity.value = actorData.data.statistics.pow.x5
-      actorData.data.sanity.currentBreakingPoint = actorData.data.sanity.value - actorData.data.statistics.pow.value;
+    if(system.sanity.value >= 100){
+      system.sanity.value = system.statistics.pow.x5
+      system.sanity.currentBreakingPoint = system.sanity.value - system.statistics.pow.value;
     };
 
-    actorData.data.sanity.max = 99 - actorData.data.skills.unnatural.proficiency;
+    system.sanity.max = 99 - system.skills.unnatural.proficiency;
 
 
     // Sanity Loss Adaptations Logic
-    let adaptations = actorData.data.sanity.adaptations;
+    let adaptations = system.sanity.adaptations;
 
     if (adaptations.violence.incident1 && adaptations.violence.incident2 && adaptations.violence.incident3){
-      actorData.data.sanity.adaptations.violence.isAdapted = true;
+      system.sanity.adaptations.violence.isAdapted = true;
     }
     else{
-      actorData.data.sanity.adaptations.violence.isAdapted = false;
+      system.sanity.adaptations.violence.isAdapted = false;
     }
 
     if (adaptations.helplessness.incident1 && adaptations.helplessness.incident2 && adaptations.helplessness.incident3){
-      actorData.data.sanity.adaptations.helplessness.isAdapted = true;
+      system.sanity.adaptations.helplessness.isAdapted = true;
     }
     else{
-      actorData.data.sanity.adaptations.helplessness.isAdapted = false;
+      system.sanity.adaptations.helplessness.isAdapted = false;
     }
 
     // calculate total armor rating
     let protection = 0;
     for (let i of agent.items) {
       if (i.type === 'armor') {
-        if(i.data.data.equipped === true){
-          protection += i.data.data.protection;
+        if(i.system.equipped === true){
+          protection += i.system.protection;
         }
       }
     }
 
-    actorData.data.health.protection = protection;
+    system.health.protection = protection;
 
     // Damage Bonus/Malus From Strength in Hand-to-hand Combat (melee/unarmed)
     let bonus = 0;
     let sbonus = "";
-    let strength = actorData.data.statistics.str;
+    let strength = system.statistics.str;
 
     if(strength.value < 5){
       sbonus = "-2";
@@ -256,8 +252,8 @@ export class DeltaGreenActor extends Actor {
       bonus = 2;
     }
     
-    actorData.data.statistics.str.meleeDamageBonus = bonus;
-    actorData.data.statistics.str.meleeDamageBonusFormula = sbonus;
+    system.statistics.str.meleeDamageBonus = bonus;
+    system.statistics.str.meleeDamageBonusFormula = sbonus;
 
     console.log(agent);
   }
@@ -278,7 +274,7 @@ export class DeltaGreenActor extends Actor {
       
       let alreadyAdded = false;
 
-      for(let item of this.data.items){
+      for(let item of this.items){
         
         let flag = await item.getFlag('deltagreen', 'SystemName');
 
@@ -299,7 +295,7 @@ export class DeltaGreenActor extends Actor {
         let _temp = await handToHandPack.getDocument(idx._id);
         
         if(_temp.name === 'Unarmed Attack'){
-          toAdd.push(_temp.data);
+          toAdd.push(_temp);
         }        
       }
 
diff --git a/module/deltagreen.js b/module/deltagreen.js
index cc67251..4ba5960 100644
--- a/module/deltagreen.js
+++ b/module/deltagreen.js
@@ -103,6 +103,8 @@ Hooks.once('init', async function() {
     }
   });
 
+
+  // Is this used anywhere?
   Handlebars.registerHelper('getActorSkillProp', function(actorData, skillName, prop) {
     try{
       if(skillName != "" && prop != ""){
@@ -295,7 +297,7 @@ Hooks.on('createActor', async function(actor, options, userId){
     // can put logic specific to a particular user session below
     if (userId != game.user.id) { return; };
 
-    if(actor != null && actor.data != null && actor.data.type === 'agent'){
+    if(actor != null && actor.type === 'agent'){
       // update the default type skill of Art - Painting's labels to try to be localized
       // since I really backed myself into a corner on this with my implementation of it...
       console.log('createActor Hook');
@@ -303,7 +305,7 @@ Hooks.on('createActor', async function(actor, options, userId){
       let artLabel = game.i18n.translations.DG?.TypeSkills?.Art ?? "Art";
       let paintingLabel = game.i18n.translations.DG?.TypeSkills?.Subskills?.Painting ?? "Painting";
 
-      let updatedData = duplicate(actor.data.data);
+      let updatedData = duplicate(actor.system);
       updatedData.typedSkills.tskill_01.group = artLabel;
       updatedData.typedSkills.tskill_01.label = paintingLabel;
       
@@ -312,7 +314,7 @@ Hooks.on('createActor', async function(actor, options, userId){
       // throw on an unarmed strike item for convenience
       actor.AddUnarmedAttackItemIfMissing();
     }
-    else if(actor.data.type === 'unnatural'){
+    else if(actor.type === 'unnatural'){
       
     }
     
@@ -336,7 +338,7 @@ Hooks.on('createActor', async function(actor, options, userId){
 async function createDeltaGreenMacro(data, slot) {
   if (data.type !== "Item") return;
   if (!("data" in data)) return ui.notifications.warn("You can only create macro buttons for owned Items");
-  const item = data.data;
+  const item = data.system;
 
   // Create the macro command
   let command = '// Uncomment line below to also roll skill check if desired.'
@@ -390,9 +392,9 @@ function rollItemSkillCheckMacro(itemName) {
   const item = actor ? actor.items.find(i => i.name === itemName) : null;
   if (!item) return ui.notifications.warn(`Your controlled Actor does not have an item named ${itemName}`);
 
-  let skillName = item.data.data.skill.toString();
+  let skillName = item.system.skill.toString();
 
-  let skill = actor.data.data.skills[skillName];
+  let skill = actor.system.skills[skillName];
   let translatedSkillLabel = "";
 
   try{
@@ -413,7 +415,7 @@ function rollSkillMacro(skillName) {
   
   if(!actor) return ui.notifications.warn('Must have an Actor selected first.');
 
-  let skill = actor.data.data.skills[skillName];
+  let skill = actor.system.skills[skillName];
 
   if(!skill) return ui.notifications.warn('Bad skill name passed to macro.');
 
diff --git a/module/item/item-sheet.js b/module/item/item-sheet.js
index 241144f..277eb31 100644
--- a/module/item/item-sheet.js
+++ b/module/item/item-sheet.js
@@ -19,14 +19,15 @@ export class DeltaGreenItemSheet extends ItemSheet {
     const path = "systems/deltagreen/templates/item";
     
     // unique item sheet by type, like `weapon-sheet.html`.
-    return `${path}/item-${this.item.data.type}-sheet.html`;
+    return `${path}/item-${this.item.type}-sheet.html`;
   }
 
   /* -------------------------------------------- */
 
   /** @override */
-  getData() {
+  async getData() {
     const data = super.getData();
+    data.enrichedDescription = await TextEditor.enrichHTML(this.object.system.description, {async: true});
     return data;
   }
 
diff --git a/module/item/item.js b/module/item/item.js
index f35a700..3117210 100644
--- a/module/item/item.js
+++ b/module/item/item.js
@@ -12,9 +12,9 @@ export class DeltaGreenItem extends Item {
     super.prepareData();
 
     // Get the Item's data
-    const itemData = this.data;
-    const actorData = this.actor ? this.actor.data : {};
-    const data = itemData.data;
+    const itemData = this;
+    const actorData = this.actor || {};
+    const system = itemData.system;
   }
 
   /**
@@ -25,21 +25,21 @@ export class DeltaGreenItem extends Item {
   async roll() {
     // Basic template rendering data
     const token = this.actor.token;
-    const item = this.data;
-    const actorData = this.actor ? this.actor.data.data : {};
-    const itemData = item.data;
+    const itemData = this;
+    const actorSystemData = this.actor.system || {};
+    const { system } = itemData;
 
-    if(item.data.isLethal){
-      sendLethalityTestToChat(this.actor, item.name, item.data.lethality, game.settings.get("core", "rollMode"))
+    if(system.isLethal){
+      sendLethalityTestToChat(this.actor, item.name, system.lethality, game.settings.get("core", "rollMode"))
     }
     else{
       // regular damage roll
 
-      let diceFormula = item.data.damage;
-      let skillType = item.data.skill;
+      let diceFormula = system.damage;
+      let skillType = system.skill;
 
       if(skillType === 'unarmed_combat' || skillType === 'melee_weapons'){
-        diceFormula += this.actor.data.data.statistics.str.meleeDamageBonusFormula;
+        diceFormula += actorSystemData.statistics.str.meleeDamageBonusFormula;
       }
 
       sendDamageRollToChat(this.actor, item.name, diceFormula);
diff --git a/module/roll/roll.js b/module/roll/roll.js
index b37c37b..01e8009 100644
--- a/module/roll/roll.js
+++ b/module/roll/roll.js
@@ -2,7 +2,7 @@ import {localizeWithFallback} from "../other/utility-functions.js"
 
 export async function sendPercentileTestToChat(actor, skill, target, rollMode){
   //let roll = new Roll('1D100', actor.data.data).evaluate(false);
-  let roll = new Roll('1D100', actor.data.data)
+  let roll = new Roll('1D100', actor.system)
   
   await roll.evaluate({async: true});
 
@@ -140,7 +140,7 @@ export function skillCheckResultIsCritical(rollResult){
 export async function sendLethalityTestToChat(actor, weaponName, target, rollMode){
   //let roll = new Roll('1D100', actor.data.data).evaluate(false);
 
-  let roll = new Roll('1D100', actor.data.data);
+  let roll = new Roll('1D100', actor.system);
 
   await roll.evaluate({async: true});
 
@@ -244,7 +244,7 @@ export async function sendDamageRollToChat(actor, label, diceFormula, rollMode){
 
   //diceFormula += actor.data.data.statistics.str.meleeDamageBonusFormula;
 
-  let roll = new Roll(diceFormula, actor.data.data);
+  let roll = new Roll(diceFormula, actor.system);
 
   await roll.evaluate({async: true});
   
diff --git a/system.json b/system.json
index 6d829e3..0d58da3 100644
--- a/system.json
+++ b/system.json
@@ -1,5 +1,5 @@
 {
-  "name": "deltagreen",
+  "id": "deltagreen",
   "title": "Delta Green (Unofficial)",
   "description": "Fan-made Foundry VTT system for Delta Green: The Role Playing Game for Foundry VTT. Based on the rules in the Agent's Handbook (https://www.drivethrurpg.com/product/181674/Delta-Green-Agents-Handbook) [*NOT* Call of Cthulu]. Made with the permission of but neither affiliated with nor endorsed by Arc Dream Publishing or the Delta Green Partnership.",
   "author": "TheLastScrub (https://github.com/TheLastScrub)",
@@ -8,8 +8,11 @@
   "license": "LICENSE.txt",
   "flags": {},
   "version": "1.0.6",
-  "minimumCoreVersion": "0.8.6",
-  "compatibleCoreVersion": "9",
+  "compatibility": {
+    "minimum": 10,
+    "verified": 10,
+    "maximum": 10
+  },
   "scripts": [],
   "esmodules": [
     "module/deltagreen.js"
@@ -101,8 +104,7 @@
       "private": false
     }
   ],
-  "system": [],
-  "dependencies": [],
+  "relationships": {}, 
   "socket": false,
   "manifest": "https://github.com/TheLastScrub/delta-green-foundry-vtt-system-unofficial/raw/master/system.json",
   "download": "https://github.com/TheLastScrub/delta-green-foundry-vtt-system-unofficial/archive/v1.0.6.zip",
diff --git a/templates/actor/actor-sheet.html b/templates/actor/actor-sheet.html
index d4694ab..08dd841 100644
--- a/templates/actor/actor-sheet.html
+++ b/templates/actor/actor-sheet.html
@@ -13,7 +13,7 @@
               <h1 class="charname"><input name="name" type="text" value="{{actor.name}}" title="{{localize 'DG.AgentNameFieldTooltip' }}"/></h1>
             </div>
             <div class="">
-              <h2 class="profession"><input name="data.biography.profession" type="text" value="{{actor.data.data.biography.profession}}" placeholder="{{localize 'DG.FallbackText.ProfessionAndOrRank'}}"/></h1>
+              <h2 class="profession"><input name="system.biography.profession" type="text" value="{{actor.system.biography.profession}}" placeholder="{{localize 'DG.FallbackText.ProfessionAndOrRank'}}"/></h1>
             </div>
           </div>
         </div>
@@ -22,51 +22,51 @@
           
           {{!-- HP --}}
           <div class="resource-outer-grid-1col">
-              <label for="actor.data.data.health.value" class="resource-label" title="{{localize 'DG.Tooltip.HP'}}">{{localize 'DG.Attributes.HP' }} (<span>{{actor.data.data.health.protection}} <i class="fas fa-shield-alt"></i></span>)</label>
+              <label for="actor.system.health.value" class="resource-label" title="{{localize 'DG.Tooltip.HP'}}">{{localize 'DG.Attributes.HP' }} (<span>{{actor.system.health.protection}} <i class="fas fa-shield-alt"></i></span>)</label>
               <div class="resource-inner-grid-3col">
-                <input type="text" name="data.health.value" value="{{actor.data.data.health.value}}" data-dtype="Number"/>
+                <input type="text" name="system.health.value" value="{{actor.system.health.value}}" data-dtype="Number"/>
                 <span> / </span>
-                <!-- <span title="{{localize 'DG.Tooltip.MaximumHP'}}" class="max-attribute-value-label">{{numberFormat data.health.max decimals=0 sign=false}}</span> -->
+                <!-- <span title="{{localize 'DG.Tooltip.MaximumHP'}}" class="max-attribute-value-label">{{numberFormat system.health.max decimals=0 sign=false}}</span> -->
                 <div class="max-resource-value" title="{{localize 'DG.Tooltip.MaximumHP'}}">
-                  <div>{{numberFormat actor.data.data.health.max decimals=0 sign=false}}</div>
+                  <div>{{numberFormat actor.system.health.max decimals=0 sign=false}}</div>
                 </div>
               </div>
           </div>
 
           {{!-- WP --}}
           <div class="resource-outer-grid-1col">
-              <label for="data.wp.value" class="resource-label" title="{{localize 'DG.Tooltip.WP'}}">{{localize 'DG.Attributes.WP' }}</label>
+              <label for="system.wp.value" class="resource-label" title="{{localize 'DG.Tooltip.WP'}}">{{localize 'DG.Attributes.WP' }}</label>
               <div class="resource-inner-grid-3col">
-                <input type="text" name="data.wp.value" value="{{actor.data.data.wp.value}}" data-dtype="Number"/>
+                <input type="text" name="system.wp.value" value="{{actor.system.wp.value}}" data-dtype="Number"/>
                 <span> / </span>
-                <!-- <span class="max-attribute-value-label" title="{{localize 'DG.Tooltip.MaximumWP'}}">{{numberFormat data.wp.max decimals=0 sign=false}}</span> -->
+                <!-- <span class="max-attribute-value-label" title="{{localize 'DG.Tooltip.MaximumWP'}}">{{numberFormat system.wp.max decimals=0 sign=false}}</span> -->
                 <div class="max-resource-value" title="{{localize 'DG.Tooltip.MaximumWP'}}">
-                  <div>{{numberFormat actor.data.data.wp.max decimals=0 sign=false}}</div>
+                  <div>{{numberFormat actor.system.wp.max decimals=0 sign=false}}</div>
                 </div>
               </div>
           </div>
 
           {{!-- Sanity --}}
           <div class="resource-outer-grid-1col">
-              <label for="data.san.value" class="resource-label rollable"
+              <label for="system.san.value" class="resource-label rollable"
                 data-rolltype="sanity" data-roll="d100" data-target="sanity" data-label="SAN" title="{{localize 'DG.Tooltip.SanityLabel'}}"
               >{{localize 'DG.Attributes.SAN' }} <i class="fas fa-dice"></i></label>
               <div class="resource-inner-grid-3col">
 
                 {{#if (keepSanityPrivate)}}
-                  <input type="text" value="??" disabled title="{{localize 'DG.Tooltip.CurrentSanityPartOne'}}{{data.sanity.currentBreakingPoint}}{{localize 'DG.Tooltip.CurrentSanityPartTwo'}}" />
+                  <input type="text" value="??" disabled title="{{localize 'DG.Tooltip.CurrentSanityPartOne'}}{{system.sanity.currentBreakingPoint}}{{localize 'DG.Tooltip.CurrentSanityPartTwo'}}" />
                   <span> / </span>
                   <div class="max-resource-value" title="{{localize 'DG.Tooltip.MaximumSanity'}}">
-                    <div>{{numberFormat actor.data.data.sanity.max decimals=0 sign=false}}</div>
+                    <div>{{numberFormat actor.system.sanity.max decimals=0 sign=false}}</div>
                   </div>
                 {{/if}}
 
                 {{#unless (keepSanityPrivate)}}
  
-                  <input type="text" name="data.sanity.value" value="{{actor.data.data.sanity.value}}" data-dtype="Number" title="{{localize 'DG.Tooltip.CurrentSanityPartOne'}}{{data.sanity.currentBreakingPoint}}{{localize 'DG.Tooltip.CurrentSanityPartTwo'}}" />
+                  <input type="text" name="system.sanity.value" value="{{actor.system.sanity.value}}" data-dtype="Number" title="{{localize 'DG.Tooltip.CurrentSanityPartOne'}}{{system.sanity.currentBreakingPoint}}{{localize 'DG.Tooltip.CurrentSanityPartTwo'}}" />
                   <span> / </span>
                   <div class="max-resource-value" title="{{localize 'DG.Tooltip.MaximumSanity'}}">
-                    <div>{{numberFormat actor.data.data.sanity.max decimals=0 sign=false}}</div>
+                    <div>{{numberFormat actor.system.sanity.max decimals=0 sign=false}}</div>
                   </div>
 
                 {{/unless}}
@@ -94,10 +94,10 @@
         <div class="tab skills" data-group="primary" data-tab="skills">
             <div class="grid grid-3col">
 
-              {{#each actor.data.data.skills as |skill key|}}
+              {{#each actor.system.skills as |skill key|}}
 
                 <div class="flexrow flex-group-center">
-                  <label class="{{if_gt skill.proficiency 0 'rollable' 'not-rollable'}} skill-label" data-rolltype="skill" data-roll="d100" data-target="{{skill.proficiency}}" data-label="{{localize (concat 'DG.Skills.' key)}}" for="data.skills.{{key}}.value" 
+                  <label class="{{if_gt skill.proficiency 0 'rollable' 'not-rollable'}} skill-label" data-rolltype="skill" data-roll="d100" data-target="{{skill.proficiency}}" data-label="{{localize (concat 'DG.Skills.' key)}}" for="system.skills.{{key}}.value" 
                       {{#if skill.proficiency}}title="{{localize 'DG.Tooltip.SkillLabel'}}"{{/if}}
                       {{#unless skill.proficiency}}title="{{localize 'DG.Tooltip.CannotRollSkillLabel'}}"{{/unless}}
                     >
@@ -107,15 +107,15 @@
                   {{#if_eq key 'ritual' }}
 
                     {{#if (keepSanityPrivate)}}
-                      <input class="percentile-skill-input" type="text" name="data.skills.{{key}}.proficiency" value="??" data-dtype="Number" {{#if skill.isCalculatedValue}} disabled {{/if}}/>
-                      <input type="checkbox" name="data.skills.{{key}}.failure" {{checked skill.failure}} data-dtype="Boolean" {{#if skill.cannotBeImprovedByFailure}} disabled {{/if}} 
+                      <input class="percentile-skill-input" type="text" name="system.skills.{{key}}.proficiency" value="??" data-dtype="Number" {{#if skill.isCalculatedValue}} disabled {{/if}}/>
+                      <input type="checkbox" name="system.skills.{{key}}.failure" {{checked skill.failure}} data-dtype="Boolean" {{#if skill.cannotBeImprovedByFailure}} disabled {{/if}} 
                         title="{{localize 'DG.Tooltip.SkillFailCheckbox'}}"
                         />
                     {{/if}}
 
                     {{#unless (keepSanityPrivate)}}
-                      <input class="percentile-skill-input" type="text" name="data.skills.{{key}}.proficiency" value="{{skill.proficiency}}" data-dtype="Number" {{#if skill.isCalculatedValue}} disabled {{/if}}/>
-                      <input type="checkbox" name="data.skills.{{key}}.failure" {{checked skill.failure}} data-dtype="Boolean" {{#if skill.cannotBeImprovedByFailure}} disabled {{/if}} 
+                      <input class="percentile-skill-input" type="text" name="system.skills.{{key}}.proficiency" value="{{skill.proficiency}}" data-dtype="Number" {{#if skill.isCalculatedValue}} disabled {{/if}}/>
+                      <input type="checkbox" name="system.skills.{{key}}.failure" {{checked skill.failure}} data-dtype="Boolean" {{#if skill.cannotBeImprovedByFailure}} disabled {{/if}} 
                         title="{{localize 'DG.Tooltip.SkillFailCheckbox'}}"
                         />
                     {{/unless}}
@@ -123,8 +123,8 @@
                   {{/if_eq}}
 
                   {{#if_not_eq key 'ritual' }}
-                    <input class="percentile-skill-input" type="text" name="data.skills.{{key}}.proficiency" value="{{skill.proficiency}}" data-dtype="Number" {{#if skill.isCalculatedValue}} disabled {{/if}}/>
-                    <input type="checkbox" name="data.skills.{{key}}.failure" {{checked skill.failure}} data-dtype="Boolean" {{#if skill.cannotBeImprovedByFailure}} disabled {{/if}} 
+                    <input class="percentile-skill-input" type="text" name="system.skills.{{key}}.proficiency" value="{{skill.proficiency}}" data-dtype="Number" {{#if skill.isCalculatedValue}} disabled {{/if}}/>
+                    <input type="checkbox" name="system.skills.{{key}}.failure" {{checked skill.failure}} data-dtype="Boolean" {{#if skill.cannotBeImprovedByFailure}} disabled {{/if}} 
                       title="{{localize 'DG.Tooltip.SkillFailCheckbox'}}"
                       />
                   {{/if_not_eq}}
@@ -138,7 +138,7 @@
               <a class="item-control typed-skill-add"><i class="fas fa-plus"></i>{{localize 'DG.Skills.AddTypedOrCustomSkill'}}</a>
             </div>
             <div class="grid-2col">
-              {{#each actor.data.data.typedSkills as |skill key|}}
+              {{#each actor.system.typedSkills as |skill key|}}
                 <div class="item flexrow flex-group-center">
                   <label class="{{if_gt skill.proficiency 0 'rollable' 'not-rollable'}} skill-label" data-rolltype="skill" data-roll="d100" data-target="{{skill.proficiency}}" data-label="{{skill.label}}" 
                       {{#if skill.proficiency}}title="{{localize 'DG.Tooltip.SkillLabel'}}"{{/if}}
@@ -146,8 +146,8 @@
                     >
                     {{skill.group}} ({{skill.label}})
                   </label>
-                  <input class="percentile-skill-input" type="text" name="data.typedSkills.{{key}}.proficiency" value="{{skill.proficiency}}" data-dtype="Number"/>
-                  <input type="checkbox" name="data.typedSkills.{{key}}.failure" {{checked skill.failure}} data-dtype="Boolean" {{#if skill.cannotBeImprovedByFailure}} disabled {{/if}} />
+                  <input class="percentile-skill-input" type="text" name="system.typedSkills.{{key}}.proficiency" value="{{skill.proficiency}}" data-dtype="Number"/>
+                  <input type="checkbox" name="system.typedSkills.{{key}}.failure" {{checked skill.failure}} data-dtype="Boolean" {{#if skill.cannotBeImprovedByFailure}} disabled {{/if}} />
                   <div class="item-controls">
                       <a class="item-control typed-skill-edit" title="Edit Skill"><i class="fas fa-edit" data-typedskill="{{key}}" ></i></a>
                       <a class="item-control typed-skill-delete" title="Delete Skill"><i class="fas fa-trash" data-typedskill="{{key}}" ></i></a>
@@ -161,16 +161,16 @@
         {{!-- Physical Statistics like STR, CON, etc. --}}
         <div class="tab physical" data-group="primary" data-tab="physical">
           <div class="grid grid-3col">
-            {{#each actor.data.data.statistics as |statistic key|}}
+            {{#each actor.system.statistics as |statistic key|}}
               <div class="flex-group-center">
                 <div class="">
                   <div class="physical-stats-outer-grid-3col">
-                    <label class="rollable" data-rolltype="statistic.x5" data-roll="d100" data-target="statistic.x5" data-label="{{key}}" title="{{localize 'DG.Tooltip.x5AttributeLabel'}}" for="data.statistics.{{key}}.value" class="resource-label">{{localize (concat 'DG.Attributes.' key)}}</label>
-                    <input type="text" name="data.statistics.{{key}}.value" value="{{statistic.value}}" data-dtype="Number"/>
+                    <label class="rollable" data-rolltype="statistic.x5" data-roll="d100" data-target="statistic.x5" data-label="{{key}}" title="{{localize 'DG.Tooltip.x5AttributeLabel'}}" for="system.statistics.{{key}}.value" class="resource-label">{{localize (concat 'DG.Attributes.' key)}}</label>
+                    <input type="text" name="system.statistics.{{key}}.value" value="{{statistic.value}}" data-dtype="Number"/>
                     <span >({{numberFormat statistic.x5 decimals=0 sign=false}}%)</span>
                   </div >
                   <div >
-                    <input type="text" name="data.statistics.{{key}}.distinguishing_feature" value="{{statistic.distinguishing_feature}}" data-dtype="String" title="{{localize 'DG.Tooltip.DistinguishingFeature'}}" />
+                    <input type="text" name="system.statistics.{{key}}.distinguishing_feature" value="{{statistic.distinguishing_feature}}" data-dtype="String" title="{{localize 'DG.Tooltip.DistinguishingFeature'}}" />
                   </div>
                 </div>
               </div>
@@ -181,13 +181,13 @@
               <label class="bolded-label first-aid-label"
                 title="{{localize 'DG.Tooltip.FirstAidAttempted'}}"
               >{{localize 'DG.Physical.FirstAidLabel'}}</label>
-              <input class="labeled-resource-checkbox" type="checkbox" name="data.physical.firstAidAttempted" {{checked actor.data.data.physical.firstAidAttempted}} data-dtype="Boolean" title="{{localize 'DG.Tooltip.FirstAidAttempted'}}" />
+              <input class="labeled-resource-checkbox" type="checkbox" name="system.physical.firstAidAttempted" {{checked actor.system.physical.firstAidAttempted}} data-dtype="Boolean" title="{{localize 'DG.Tooltip.FirstAidAttempted'}}" />
             </div>
             <div>
               <label class="bolded-label">{{localize 'DG.Physical.Wounds'}}</label>
-              <!--<input class="fill-remaining-space" type="text" name="data.physical.wounds" value="{{data.physical.wounds}}" data-dtype="String" /> -->
+              <!--<input class="fill-remaining-space" type="text" name="system.physical.wounds" value="{{system.physical.wounds}}" data-dtype="String" /> -->
               <!-- This seems to save values, but not retrieve them... -->
-              <textarea class="wounds" rows="10" cols="10" name="data.physical.wounds">{{actor.data.data.physical.wounds}}</textarea>
+              <textarea class="wounds" rows="10" cols="10" name="system.physical.wounds">{{actor.system.physical.wounds}}</textarea>
             </div>
           </div>
         </div>
@@ -197,7 +197,7 @@
           <div class="">
               <div class="breaking-point-grid-3col">
                 <label class="bolded-label">{{localize 'DG.Mental.BreakingPoint'}}</label>
-                <input class="centered-input-value" title="{{localize 'DG.Tooltip.BreakPoint'}}" type="text" name="data.sanity.currentBreakingPoint" value="{{actor.data.data.sanity.currentBreakingPoint}}" data-dtype="Number"/>
+                <input class="centered-input-value" title="{{localize 'DG.Tooltip.BreakPoint'}}" type="text" name="system.sanity.currentBreakingPoint" value="{{actor.system.sanity.currentBreakingPoint}}" data-dtype="Number"/>
                 <a class="btn-tiny btn-reset-breaking-point" title="Reset breaking point to be current SAN - WP.">{{localize 'DG.Mental.Reset'}}</a>
               </div>
           
@@ -206,27 +206,27 @@
                 <div class="adaptation-grid-5col">
                   
                   <Label>{{localize 'DG.Mental.Violence'}}</Label>
-                  <input class="labeled-resource-checkbox" type="checkbox" name="data.sanity.adaptations.violence.incident1" {{checked actor.data.data.sanity.adaptations.violence.incident1}} data-dtype="Boolean" />
-                  <input class="labeled-resource-checkbox" type="checkbox" name="data.sanity.adaptations.violence.incident2" {{checked actor.data.data.sanity.adaptations.violence.incident2}} data-dtype="Boolean" />
-                  <input class="labeled-resource-checkbox" type="checkbox" name="data.sanity.adaptations.violence.incident3" {{checked actor.data.data.sanity.adaptations.violence.incident3}} data-dtype="Boolean" />
+                  <input class="labeled-resource-checkbox" type="checkbox" name="system.sanity.adaptations.violence.incident1" {{checked actor.system.sanity.adaptations.violence.incident1}} data-dtype="Boolean" />
+                  <input class="labeled-resource-checkbox" type="checkbox" name="system.sanity.adaptations.violence.incident2" {{checked actor.system.sanity.adaptations.violence.incident2}} data-dtype="Boolean" />
+                  <input class="labeled-resource-checkbox" type="checkbox" name="system.sanity.adaptations.violence.incident3" {{checked actor.system.sanity.adaptations.violence.incident3}} data-dtype="Boolean" />
                   
                   <label class="adapted-label"
                     title="{{localize 'DG.Tooltip.AdaptedToViolence'}}"
                   >
-                  {{#if actor.data.data.sanity.adaptations.violence.isAdapted}}
+                  {{#if actor.system.sanity.adaptations.violence.isAdapted}}
                     {{localize 'DG.Mental.AdaptedToViolence'}}
                   {{/if}}
                   </label>
                   
                   <label>{{localize 'DG.Mental.Helplessness'}}</label>
-                  <input class="labeled-resource-checkbox" type="checkbox" name="data.sanity.adaptations.helplessness.incident1" {{checked actor.data.data.sanity.adaptations.helplessness.incident1}} data-dtype="Boolean" />
-                  <input class="labeled-resource-checkbox" type="checkbox" name="data.sanity.adaptations.helplessness.incident2" {{checked actor.data.data.sanity.adaptations.helplessness.incident2}} data-dtype="Boolean" />
-                  <input class="labeled-resource-checkbox" type="checkbox" name="data.sanity.adaptations.helplessness.incident3" {{checked actor.data.data.sanity.adaptations.helplessness.incident3}} data-dtype="Boolean" />
+                  <input class="labeled-resource-checkbox" type="checkbox" name="system.sanity.adaptations.helplessness.incident1" {{checked actor.system.sanity.adaptations.helplessness.incident1}} data-dtype="Boolean" />
+                  <input class="labeled-resource-checkbox" type="checkbox" name="system.sanity.adaptations.helplessness.incident2" {{checked actor.system.sanity.adaptations.helplessness.incident2}} data-dtype="Boolean" />
+                  <input class="labeled-resource-checkbox" type="checkbox" name="system.sanity.adaptations.helplessness.incident3" {{checked actor.system.sanity.adaptations.helplessness.incident3}} data-dtype="Boolean" />
                   
                   <label class="adapted-label"
                     title="{{localize 'DG.Tooltip.AdaptedToHelplessness'}}"
                   >
-                  {{#if actor.data.data.sanity.adaptations.helplessness.isAdapted}}
+                  {{#if actor.system.sanity.adaptations.helplessness.isAdapted}}
                     {{localize 'DG.Mental.AdaptedToHelplessness'}}
                   {{/if}}
                   </label>
@@ -251,15 +251,15 @@
 
                   <li class="item flexrow" data-item-id="{{item.id}}">
                     <h4 class="item-name"
-                      {{#if item.data.data.crossedOut}}
+                      {{#if item.system.crossedOut}}
                         style="text-decoration: line-through;"
                       {{/if}}
                       >
                       {{item.name}}
                     </h4>
 
-                    {{#if item.data.data.crossedOut}}
-                      <h4 class="item-name">{{item.data.data.disorder}}</h4>
+                    {{#if item.system.crossedOut}}
+                      <h4 class="item-name">{{item.system.disorder}}</h4>
                     {{/if}}
 
                     <div class="item-controls">
@@ -305,32 +305,32 @@
                       class="item-name rollable" 
                       data-roll="d100"
                       data-rolltype="weaponskill" 
-                      data-target="{{item.data.data.skill}}"                         
-                      data-label="{{localizeWeaponSkill item.data.data.skill}}"
-                      title="{{localize 'DG.Tooltip.SkillLabel'}} ({{localizeWeaponSkill item.data.data.skill}})"
+                      data-target="{{item.system.skill}}"                         
+                      data-label="{{localizeWeaponSkill item.system.skill}}"
+                      title="{{localize 'DG.Tooltip.SkillLabel'}} ({{localizeWeaponSkill item.system.skill}})"
                       >
                         {{item.name}}
                     </h4>
 
-                    {{#unless item.data.data.isLethal}}
+                    {{#unless item.system.isLethal}}
                     <span class="rollable centered-item-property" 
                       
                       data-rolltype="damage" 
                       data-target="damage" 
                       data-label="{{toUpperCase item.name}}" 
-                      data-roll="{{toUpperCase item.data.data.damage}}"
-                      data-skill="{{item.data.data.skill}}"
+                      data-roll="{{toUpperCase item.system.damage}}"
+                      data-skill="{{item.system.skill}}"
                       >                      
-                      {{toUpperCase item.data.data.damage}}{{#if_eq item.data.data.skill 'unarmed_combat'}}{{actor.data.data.statistics.str.meleeDamageBonusFormula}}{{/if_eq}}{{#if_eq item.data.data.skill 'melee_weapons'}}{{actor.data.data.statistics.str.meleeDamageBonusFormula}}{{/if_eq}}</span>
+                      {{toUpperCase item.system.damage}}{{#if_eq item.system.skill 'unarmed_combat'}}{{actor.system.statistics.str.meleeDamageBonusFormula}}{{/if_eq}}{{#if_eq item.system.skill 'melee_weapons'}}{{actor.system.statistics.str.meleeDamageBonusFormula}}{{/if_eq}}</span>
                     {{/unless}}
 
-                    {{#if item.data.data.isLethal}}
-                    <span class="rollable  centered-item-property" data-rolltype="lethality" data-target="{{item.data.data.lethality}}" data-label="{{item.name}}" data-roll="d100"
+                    {{#if item.system.isLethal}}
+                    <span class="rollable  centered-item-property" data-rolltype="lethality" data-target="{{item.system.lethality}}" data-label="{{item.name}}" data-roll="d100"
                       title="{{localize 'DG.ItemWindow.Weapons.LethalityTooltip'}}"
-                      >{{formatLethality item.data.data.lethality}}</span>
+                      >{{formatLethality item.system.lethality}}</span>
                     {{/if}}
 
-                    <span class="centered-item-property">{{item.data.data.armorPiercing}}</span>
+                    <span class="centered-item-property">{{item.system.armorPiercing}}</span>
 
                     <div class="item-controls">
                         <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
@@ -366,10 +366,10 @@
                   <li class="item flexrow" data-item-id="{{item.id}}">
                     <div class="item-image"><img src="{{item.img}}" title="{{item.name}}" width="24" height="24"/></div>
                     <h4 style="word-wrap: break-word;" class="item-name">{{item.name}}</h4>
-                    <span class="centered-item-property">{{item.data.data.protection}}</span>
+                    <span class="centered-item-property">{{item.system.protection}}</span>
                     
                     <span class="equipped-item centered-item-property" data-id="{{item.id}}" title="{{localize 'DG.Tooltip.ToggleEquippedState'}}">
-                      {{#if item.data.data.equipped}}
+                      {{#if item.system.equipped}}
                         <span class="fas fa-check"></span>
                       {{else}}
                         <span class="fas fa-times"></span>
@@ -415,7 +415,7 @@
                     
                     <span class="equipped-item centered-item-property" data-id="{{item.id}}" title="{{localize 'DG.Tooltip.ToggleEquippedState'}}" >
                       
-                      {{#if item.data.data.equipped}}
+                      {{#if item.system.equipped}}
                         <span class="fas fa-check"></span>
                       {{else}}
                         <span class="fas fa-times"></span>
@@ -463,8 +463,8 @@
                   <li class="item flexrow" data-item-id="{{item.id}}">
                     
                     <h4 style="word-wrap: break-word;" class="item-name">{{item.name}}</h4>
-                    <span>{{item.data.data.relationship}}</span>
-                    <span>{{item.data.data.score}}</span>                    
+                    <span>{{item.system.relationship}}</span>
+                    <span>{{item.system.score}}</span>                    
                     <div class="item-controls">
                         <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
                         <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
diff --git a/templates/actor/cv-partial.html b/templates/actor/cv-partial.html
index aeeec1c..336975f 100644
--- a/templates/actor/cv-partial.html
+++ b/templates/actor/cv-partial.html
@@ -1,24 +1,24 @@
 <div class="bio-grid-5col bio-grid-top-border">
     <span>{{localize 'DG.CV.Sex'}}</span>
-    <input class="fill-remaining-space" type="text" name="data.biography.sex" value="{{actor.data.data.biography.sex}}" data-dtype="String" placeholder="{{localize 'DG.CV.SexPlaceholder'}}" />
+    <input class="fill-remaining-space" type="text" name="system.biography.sex" value="{{actor.system.biography.sex}}" data-dtype="String" placeholder="{{localize 'DG.CV.SexPlaceholder'}}" />
     <span></span>
     <span class="bio-grid-label">{{localize 'DG.CV.AgeAndDoB'}}</span>
-    <input class="fill-remaining-space" type="text" name="data.biography.age" value="{{actor.data.data.biography.age}}" data-dtype="String" placeholder="{{localize 'DG.CV.AgeAndDoBPlaceholder'}}" />
+    <input class="fill-remaining-space" type="text" name="system.biography.age" value="{{actor.system.biography.age}}" data-dtype="String" placeholder="{{localize 'DG.CV.AgeAndDoBPlaceholder'}}" />
 </div>
 
 <div class="bio-grid-2col">
   
     <span>{{localize 'DG.CV.Employer'}}</span>
-    <input class="fill-remaining-space" type="text" name="data.biography.employer" value="{{actor.data.data.biography.employer}}" data-dtype="String" placeholder="{{localize 'DG.CV.EmployerPlaceholder'}}" />
+    <input class="fill-remaining-space" type="text" name="system.biography.employer" value="{{actor.system.biography.employer}}" data-dtype="String" placeholder="{{localize 'DG.CV.EmployerPlaceholder'}}" />
   
     <span>{{localize 'DG.CV.Nationality'}}</span>
-    <input class="fill-remaining-space" type="text" name="data.biography.nationality" value="{{actor.data.data.biography.nationality}}" data-dtype="String" placeholder="{{localize 'DG.CV.NationalityPlaceholder'}}" />
+    <input class="fill-remaining-space" type="text" name="system.biography.nationality" value="{{actor.system.biography.nationality}}" data-dtype="String" placeholder="{{localize 'DG.CV.NationalityPlaceholder'}}" />
   
 </div>
 
 <div class="bio-grid-2col">
     <span>{{localize 'DG.CV.Education'}}</span>
-    <input class="fill-remaining-space" type="text" name="data.biography.education" value="{{actor.data.data.biography.education}}" data-dtype="String" placeholder="{{localize 'DG.CV.EducationPlaceholder'}}" />
+    <input class="fill-remaining-space" type="text" name="system.biography.education" value="{{actor.system.biography.education}}" data-dtype="String" placeholder="{{localize 'DG.CV.EducationPlaceholder'}}" />
 </div>
 
 {{#if (playerHasGamemasterPrivileges)}}
@@ -27,20 +27,20 @@
     <span class="yellow-king yellow-king-rotate2">{{localize 'DG.ImpossibleLanscapes.IHaveSeenThe'}}</span>
     <span></span>
     <span class="yellow-king yellow-sign">{{localize 'DG.ImpossibleLanscapes.YellowSign'}}</span>
-    <input type="checkbox" name="data.corruption.haveSeenTheYellowSign" {{checked actor.data.data.corruption.haveSeenTheYellowSign}} data-dtype="Boolean" />
+    <input type="checkbox" name="system.corruption.haveSeenTheYellowSign" {{checked actor.system.corruption.haveSeenTheYellowSign}} data-dtype="Boolean" />
     <span></span>
     <span class="yellow-king yellow-king-rotate1">{{localize 'DG.ImpossibleLanscapes.CorruptionFirstHalf'}}</span>
     <span class="yellow-king yellow-king-rotate4">{{localize 'DG.ImpossibleLanscapes.CorruptionSecondHalf'}}</span>
     <span></span>
-    <input class="yellow-king" type="number" placeholder="0" name="data.corruption.value" value="{{actor.data.data.corruption.value}}" />
+    <input class="yellow-king" type="number" placeholder="0" name="system.corruption.value" value="{{actor.system.corruption.value}}" />
 </div>
 
 <div class="yellow-king yellow-king-grid-5col">
     <span class="yellow-king-label">{{localize 'DG.ImpossibleLanscapes.Gift'}}</span>
-    <input class="fill-remaining-space" type="text" name="data.corruption.gift" value="{{actor.data.data.corruption.gift}}" data-dtype="String" />
+    <input class="fill-remaining-space" type="text" name="system.corruption.gift" value="{{actor.system.corruption.gift}}" data-dtype="String" />
     <span></span>
     <span class="yellow-king-label">{{localize 'DG.ImpossibleLanscapes.Insight'}}</span>
-    <input class="fill-remaining-space" type="text" name="data.corruption.insight" value="{{actor.data.data.corruption.insight}}" data-dtype="String" />
+    <input class="fill-remaining-space" type="text" name="system.corruption.insight" value="{{actor.system.corruption.insight}}" data-dtype="String" />
 </div>
 
 {{/if}}
@@ -50,5 +50,5 @@
 </div>
 
 <div class="editor-host">
-    {{editor content=actor.data.data.physicalDescription target="data.physicalDescription" button=true owner=owner editable=editable}}
+    {{editor enrichedDescription target="system.physicalDescription" button=true owner=owner editable=editable}}
 </div>
\ No newline at end of file
diff --git a/templates/actor/limited-sheet.html b/templates/actor/limited-sheet.html
index 65af6a2..9400c44 100644
--- a/templates/actor/limited-sheet.html
+++ b/templates/actor/limited-sheet.html
@@ -13,7 +13,7 @@
               <h1 class="charname"><input name="name" type="text" value="{{actor.name}}" title="{{localize 'DG.AgentNameFieldTooltip' }}"/></h1>
             </div>
             <div>
-              <h2 class="profession"><input name="data.biography.profession" type="text" value="{{data.data.biography.profession}}" placeholder="{{localize 'DG.FallbackText.ProfessionAndOrRank'}}"/></h1>
+              <h2 class="profession"><input name="system.biography.profession" type="text" value="{{actor.system.biography.profession}}" placeholder="{{localize 'DG.FallbackText.ProfessionAndOrRank'}}"/></h1>
             </div>
           </div>
         </div>
diff --git a/templates/actor/npc-sheet.html b/templates/actor/npc-sheet.html
index 02805df..c0173a2 100644
--- a/templates/actor/npc-sheet.html
+++ b/templates/actor/npc-sheet.html
@@ -1,5 +1,4 @@
 <form class="{{cssClass}} {{getFontFamilySystemSettingClass}} flexcol" autocomplete="off">
-
   {{!-- Sheet Header --}}
   <header class="sheet-header">
       
@@ -13,7 +12,7 @@
             <h1 class="charname"><input name="name" type="text" value="{{actor.name}}" /></h1>
           </div>
           <div class="">
-            <h2 class="profession"><input name="data.shortDescription" type="text" value="{{actor.data.data.shortDescription}}" placeholder="{{localize 'DG.FallbackText.ProfessionAndOrRank'}}"/></h1>
+            <h2 class="profession"><input name="system.shortDescription" type="text" value="{{actor.system.shortDescription}}" placeholder="{{localize 'DG.FallbackText.ProfessionAndOrRank'}}"/></h1>
           </div>
         </div>
       </div>
@@ -22,33 +21,33 @@
         
         {{!-- HP --}}
         <div class="resource-outer-grid-1col">
-            <label for="actor.data.data.health.value" class="resource-label" title="{{localize 'DG.Tooltip.HP'}}">{{localize 'DG.Attributes.HP'}} (<span>{{actor.data.data.health.protection}} <i class="fas fa-shield-alt"></i></span>)</label>
+            <label for="actor.system.health.value" class="resource-label" title="{{localize 'DG.Tooltip.HP'}}">{{localize 'DG.Attributes.HP'}} (<span>{{actor.system.health.protection}} <i class="fas fa-shield-alt"></i></span>)</label>
             <div class="resource-inner-grid-3col">
-              <input type="text" name="data.health.value" value="{{actor.data.data.health.value}}" data-dtype="Number"/>
+              <input type="text" name="system.health.value" value="{{actor.system.health.value}}" data-dtype="Number"/>
               <span> / </span>
-              <input type="text" name="data.health.max" value="{{actor.data.data.health.max}}" data-dtype="Number"/>
+              <input type="text" name="system.health.max" value="{{actor.system.health.max}}" data-dtype="Number"/>
             </div>
         </div>
 
         {{!-- WP --}}
         <div class="resource-outer-grid-1col">
-            <label for="data.wp.value" class="resource-label" title="{{localize 'DG.Tooltip.WP'}}">{{localize 'DG.Attributes.WP' }}</label>
+            <label for="system.wp.value" class="resource-label" title="{{localize 'DG.Tooltip.WP'}}">{{localize 'DG.Attributes.WP' }}</label>
             <div class="resource-inner-grid-3col">
-              <input type="text" name="data.wp.value" value="{{actor.data.data.wp.value}}" data-dtype="Number"/>
+              <input type="text" name="system.wp.value" value="{{actor.system.wp.value}}" data-dtype="Number"/>
               <span> / </span>
-              <input type="text" name="data.wp.max" value="{{actor.data.data.wp.max}}" data-dtype="Number"/>
+              <input type="text" name="system.wp.max" value="{{actor.system.wp.max}}" data-dtype="Number"/>
             </div>
         </div>
 
         {{!-- Sanity --}}
         <div class="resource-outer-grid-1col">
-            <label for="data.wp.value" class="resource-label rollable"
+            <label for="system.wp.value" class="resource-label rollable"
               data-rolltype="sanity" data-roll="d100" data-target="sanity" data-label="SAN" title="{{localize 'DG.Tooltip.SanityLabel'}}"
             >{{localize 'DG.Attributes.SAN' }}</label>
             <div class="resource-inner-grid-3col">
-              <input type="text" name="data.sanity.value" value="{{actor.data.data.sanity.value}}" data-dtype="Number" title="{{localize 'DG.Tooltip.CurrentSanityPartOne'}}{{actor.data.data.sanity.currentBreakingPoint}}{{localize 'DG.Tooltip.CurrentSanityPartTwo'}}" />
+              <input type="text" name="system.sanity.value" value="{{actor.system.sanity.value}}" data-dtype="Number" title="{{localize 'DG.Tooltip.CurrentSanityPartOne'}}{{actor.system.sanity.currentBreakingPoint}}{{localize 'DG.Tooltip.CurrentSanityPartTwo'}}" />
               <span> {{localize 'DG.NPCSheet.BreakPointAbbreviation'}}: </span>
-              <input type="text" name="data.sanity.currentBreakingPoint" value="{{actor.data.data.sanity.currentBreakingPoint}}" data-dtype="Number" title="{{localize 'DG.Tooltip.BreakPoint'}}" />
+              <input type="text" name="system.sanity.currentBreakingPoint" value="{{actor.system.sanity.currentBreakingPoint}}" data-dtype="Number" title="{{localize 'DG.Tooltip.BreakPoint'}}" />
             </div>
         </div>
       </div>
@@ -58,15 +57,15 @@
       {{!-- Physical Statistics like STR, CON, etc. --}}
       <div class="">
         <div class="grid grid-3col">
-          {{#each actor.data.data.statistics as |statistic key|}}
+          {{#each actor.system.statistics as |statistic key|}}
             <div class="flex-group-center">
               <div class="">
                 <div class="physical-stats-outer-grid-3col">
-                  <label class="rollable" data-rolltype="statistic.x5" data-roll="d100" data-target="statistic.x5" data-label="{{key}}" title="{{localize 'DG.Tooltip.x5AttributeLabel'}}" for="data.statistics.{{key}}.value" class="resource-label">{{localize (concat 'DG.Attributes.' key)}}</label>
-                  <input type="text" name="data.statistics.{{key}}.value" value="{{statistic.value}}" data-dtype="Number"/>
+                  <label class="rollable" data-rolltype="statistic.x5" data-roll="d100" data-target="statistic.x5" data-label="{{key}}" title="{{localize 'DG.Tooltip.x5AttributeLabel'}}" for="system.statistics.{{key}}.value" class="resource-label">{{localize (concat 'DG.Attributes.' key)}}</label>
+                  <input type="text" name="system.statistics.{{key}}.value" value="{{statistic.value}}" data-dtype="Number"/>
                   <span >({{numberFormat statistic.x5 decimals=0 sign=false}}%)</span>
                 </div >
-                {{!-- <div> <input type="text" name="data.statistics.{{key}}.distinguishing_feature" value="{{statistic.distinguishing_feature}}" data-dtype="String" title="{{localize 'DG.Tooltip.DistinguishingFeature'}}" /> </div> --}}
+                {{!-- <div> <input type="text" name="system.statistics.{{key}}.distinguishing_feature" value="{{statistic.distinguishing_feature}}" data-dtype="String" title="{{localize 'DG.Tooltip.DistinguishingFeature'}}" /> </div> --}}
               </div>
             </div>
           {{/each}}
@@ -90,22 +89,22 @@
     <div class="tab skills" data-group="primary" data-tab="skills">
       {{!-- Checkbox to hide/show skills that are at zero --}}
       <div>
-        <span class="resource-label" for="data.showUntrainedSkills">{{localize 'DG.UnnaturalSheet.HideUntrainedSkillsLabel'}}:</label>
-        <input class="labeled-resource-checkbox" type="checkbox" name="data.showUntrainedSkills" {{checked data.data.showUntrainedSkills}} data-dtype="Boolean" />
+        <span class="resource-label" for="system.showUntrainedSkills">{{localize 'DG.UnnaturalSheet.HideUntrainedSkillsLabel'}}:</label>
+        <input class="labeled-resource-checkbox" type="checkbox" name="system.showUntrainedSkills" {{checked actor.system.showUntrainedSkills}} data-dtype="Boolean" />
       </div>
 
       <div class="grid grid-3col">
-        {{#each actor.data.data.skills as |skill key|}}
+        {{#each actor.system.skills as |skill key|}}
           
-          {{#if (hideSkillBasedOnProficiencyAndUserChoice ../actor.data.data.showUntrainedSkills skill.proficiency)}}
+          {{#if (hideSkillBasedOnProficiencyAndUserChoice ../actor.system.showUntrainedSkills skill.proficiency)}}
           <div class="flexrow flex-group-center">
-            <label class="{{if_gt skill.proficiency 0 'rollable' 'not-rollable'}} skill-label" data-rolltype="skill" data-roll="d100" data-target="{{skill.proficiency}}" data-label="{{localize (concat 'DG.Skills.' key)}}" for="data.skills.{{key}}.value" 
+            <label class="{{if_gt skill.proficiency 0 'rollable' 'not-rollable'}} skill-label" data-rolltype="skill" data-roll="d100" data-target="{{skill.proficiency}}" data-label="{{localize (concat 'DG.Skills.' key)}}" for="system.skills.{{key}}.value" 
                 {{#if skill.proficiency}}title="{{localize 'DG.Tooltip.SkillLabel'}}"{{/if}}
                 {{#unless skill.proficiency}}title="{{localize 'DG.Tooltip.CannotRollSkillLabel'}}"{{/unless}}
               >
               {{ localize (concat "DG.Skills." key) }}
             </label>
-            <input class="percentile-skill-input" type="text" name="data.skills.{{key}}.proficiency" value="{{skill.proficiency}}" data-dtype="Number" {{#if skill.isCalculatedValue}} disabled {{/if}}/>
+            <input class="percentile-skill-input" type="text" name="system.skills.{{key}}.proficiency" value="{{skill.proficiency}}" data-dtype="Number" {{#if skill.isCalculatedValue}} disabled {{/if}}/>
             
           </div>
           {{/if}}
@@ -118,8 +117,8 @@
           <a class="item-control typed-skill-add"><i class="fas fa-plus"></i>{{localize 'DG.Skills.AddTypedOrCustomSkill'}}</a>
         </div>
         <div class="grid-2col">
-          {{#each actor.data.data.typedSkills as |skill key|}}
-            {{#if (hideSkillBasedOnProficiencyAndUserChoice ../actor.data.data.showUntrainedSkills skill.proficiency)}}
+          {{#each actor.system.typedSkills as |skill key|}}
+            {{#if (hideSkillBasedOnProficiencyAndUserChoice ../actor.system.showUntrainedSkills skill.proficiency)}}
             <div class="item flexrow flex-group-center">
               <label class="{{if_gt skill.proficiency 0 'rollable' 'not-rollable'}} skill-label" data-rolltype="skill" data-roll="d100" data-target="{{skill.proficiency}}" data-label="{{skill.label}}" 
                   {{#if skill.proficiency}}title="{{localize 'DG.Tooltip.SkillLabel'}}"{{/if}}
@@ -127,7 +126,7 @@
                 >
                 {{skill.group}} ({{skill.label}})
               </label>
-              <input class="percentile-skill-input" type="text" name="data.typedSkills.{{key}}.proficiency" value="{{skill.proficiency}}" data-dtype="Number"/>
+              <input class="percentile-skill-input" type="text" name="system.typedSkills.{{key}}.proficiency" value="{{skill.proficiency}}" data-dtype="Number"/>
               
               <div class="item-controls">
                   <a class="item-control typed-skill-delete" title="Delete Skill"><i class="fas fa-trash" data-typedskill="{{key}}" ></i></a>
@@ -143,7 +142,7 @@
       </div>
       <div class="unnatural-notes-section">
         <div class="editor-host">
-          {{editor content=actor.data.data.notes target="data.notes" button=true owner=owner editable=editable}}
+          {{editor enrichedDescription target="system.notes" button=true owner=owner editable=editable}}
         </div>
       </div>
       
@@ -180,32 +179,32 @@
                   class="item-name rollable" 
                   data-roll="d100"
                   data-rolltype="weaponskill" 
-                  data-target="{{item.data.data.skill}}"                         
-                  data-label="{{localizeWeaponSkill item.data.data.skill}}"
-                  title="{{localize 'DG.Tooltip.SkillLabel'}} ({{localizeWeaponSkill item.data.data.skill}})"
+                  data-target="{{item.system.skill}}"                         
+                  data-label="{{localizeWeaponSkill item.system.skill}}"
+                  title="{{localize 'DG.Tooltip.SkillLabel'}} ({{localizeWeaponSkill item.system.skill}})"
                   >
                     {{item.name}}
                 </h4>
 
-                {{#unless item.data.data.isLethal}}
+                {{#unless item.system.isLethal}}
                 <span class="rollable centered-item-property" 
                   
                   data-rolltype="damage" 
                   data-target="damage" 
                   data-label="{{toUpperCase item.name}}" 
-                  data-roll="{{toUpperCase item.data.data.damage}}"
-                  data-skill="{{item.data.data.skill}}"
+                  data-roll="{{toUpperCase item.system.damage}}"
+                  data-skill="{{item.system.skill}}"
                   >                      
-                  {{toUpperCase item.data.data.damage}}</span>
+                  {{toUpperCase item.system.damage}}</span>
                 {{/unless}}
 
-                {{#if item.data.data.isLethal}}
-                <span class="rollable  centered-item-property" data-rolltype="lethality" data-target="{{item.data.data.lethality}}" data-label="{{item.name}}" data-roll="d100"
+                {{#if item.system.isLethal}}
+                <span class="rollable  centered-item-property" data-rolltype="lethality" data-target="{{item.system.lethality}}" data-label="{{item.name}}" data-roll="d100"
                   title="{{localize 'DG.ItemWindow.Weapons.LethalityTooltip'}}"
-                  >{{formatLethality item.data.data.lethality}}</span>
+                  >{{formatLethality item.system.lethality}}</span>
                 {{/if}}
 
-                <span class="centered-item-property">{{item.data.data.armorPiercing}}</span>
+                <span class="centered-item-property">{{item.system.armorPiercing}}</span>
 
                 <div class="item-controls">
                     <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
@@ -241,10 +240,10 @@
               <li class="item flexrow" data-item-id="{{item.id}}">
                 <div class="item-image"><img src="{{item.img}}" title="{{item.name}}" width="24" height="24"/></div>
                 <h4 style="word-wrap: break-word;" class="item-name">{{item.name}}</h4>
-                <span class="centered-item-property">{{item.data.data.protection}}</span>
+                <span class="centered-item-property">{{item.system.protection}}</span>
                 
                 <span class="equipped-item centered-item-property" data-id="{{item.id}}" title="{{localize 'DG.Tooltip.ToggleEquippedState'}}">
-                  {{#if item.data.data.equipped}}
+                  {{#if item.system.equipped}}
                     <span class="fas fa-check"></span>
                   {{else}}
                     <span class="fas fa-times"></span>
@@ -291,7 +290,7 @@
                 
                 <span class="equipped-item centered-item-property" data-id="{{item.id}}" title="{{localize 'DG.Tooltip.ToggleEquippedState'}}" >
                   
-                  {{#if item.data.data.equipped}}
+                  {{#if item.system.equipped}}
                     <span class="fas fa-check"></span>
                   {{else}}
                     <span class="fas fa-times"></span>
diff --git a/templates/actor/unnatural-sheet.html b/templates/actor/unnatural-sheet.html
index 54b62d5..f5f0c92 100644
--- a/templates/actor/unnatural-sheet.html
+++ b/templates/actor/unnatural-sheet.html
@@ -1,5 +1,4 @@
 <form class="{{cssClass}} {{getFontFamilySystemSettingClass}} flexcol" autocomplete="off">
-
   {{!-- Sheet Header --}}
   <header class="sheet-header">
       
@@ -13,7 +12,7 @@
             <h1 class="charname"><input name="name" type="text" value="{{actor.name}}" /></h1>
           </div>
           <div class="">
-            <h2 class="profession"><input name="data.shortDescription" type="text" value="{{actor.data.data.shortDescription}}" placeholder="{{localize 'DG.UnnaturalSheet.ShortDescriptionFallbackText'}}"/></h1>
+            <h2 class="profession"><input name="system.shortDescription" type="text" value="{{actor.system.shortDescription}}" placeholder="{{localize 'DG.UnnaturalSheet.ShortDescriptionFallbackText'}}"/></h1>
           </div>
         </div>
       </div>
@@ -22,31 +21,31 @@
         
         {{!-- HP --}}
         <div class="resource-outer-grid-1col">
-            <label for="actor.data.data.health.value" class="resource-label" title="{{localize 'DG.Tooltip.HP'}}">{{localize 'DG.Attributes.HP'}} (<span>{{actor.data.data.health.protection}} <i class="fas fa-shield-alt"></i></span>)</label>
+            <label for="actor.system.health.value" class="resource-label" title="{{localize 'DG.Tooltip.HP'}}">{{localize 'DG.Attributes.HP'}} (<span>{{actor.system.health.protection}} <i class="fas fa-shield-alt"></i></span>)</label>
             <div class="resource-inner-grid-3col">
-              <input type="text" name="data.health.value" value="{{actor.data.data.health.value}}" data-dtype="Number"/>
+              <input type="text" name="system.health.value" value="{{actor.system.health.value}}" data-dtype="Number"/>
               <span> / </span>
-              <input type="text" name="data.health.max" value="{{actor.data.data.health.max}}" data-dtype="Number"/>
+              <input type="text" name="system.health.max" value="{{actor.system.health.max}}" data-dtype="Number"/>
             </div>
         </div>
 
         {{!-- WP --}}
         <div class="resource-outer-grid-1col">
-            <label for="data.wp.value" class="resource-label">{{localize 'DG.Attributes.WP' }}</label>
+            <label for="system.wp.value" class="resource-label">{{localize 'DG.Attributes.WP' }}</label>
             <div class="resource-inner-grid-3col">
-              <input type="text" name="data.wp.value" value="{{actor.data.data.wp.value}}" data-dtype="Number"/>
+              <input type="text" name="system.wp.value" value="{{actor.system.wp.value}}" data-dtype="Number"/>
               <span> / </span>
-              <input type="text" name="data.wp.max" value="{{actor.data.data.wp.max}}" data-dtype="Number"/>
+              <input type="text" name="system.wp.max" value="{{actor.system.wp.max}}" data-dtype="Number"/>
             </div>
         </div>
 
         {{!-- Sanity Damage --}}
         <div class="resource-outer-grid-1col">
-          <label for="data.wp.value" class="resource-label">Sanity Damage</label>
+          <label for="system.wp.value" class="resource-label">Sanity Damage</label>
           <div class="resource-inner-grid-3col">
-            <input type="text" name="data.sanity.successLoss" value="{{actor.data.data.sanity.successLoss}}" />
+            <input type="text" name="system.sanity.successLoss" value="{{actor.system.sanity.successLoss}}" />
             <span> / </span>
-            <input type="text" name="data.sanity.failedLoss" value="{{actor.data.data.sanity.failedLoss}}" />
+            <input type="text" name="system.sanity.failedLoss" value="{{actor.system.sanity.failedLoss}}" />
           </div>
         </div>
       </div>
@@ -56,12 +55,12 @@
       {{!-- Physical Statistics like STR, CON, etc. --}}
       <div class="">
         <div class="grid grid-3col">
-          {{#each actor.data.data.statistics as |statistic key|}}
+          {{#each actor.system.statistics as |statistic key|}}
             <div class="flex-group-center">
               <div class="">
                 <div class="physical-stats-outer-grid-3col">
-                  <label class="rollable" data-rolltype="statistic.x5" data-roll="d100" data-target="statistic.x5" data-label="{{key}}" for="data.statistics.{{key}}.value" class="resource-label">{{localize (concat 'DG.Attributes.' key)}}</label>
-                  <input type="text" name="data.statistics.{{key}}.value" value="{{statistic.value}}" data-dtype="Number"/>
+                  <label class="rollable" data-rolltype="statistic.x5" data-roll="d100" data-target="statistic.x5" data-label="{{key}}" for="system.statistics.{{key}}.value" class="resource-label">{{localize (concat 'DG.Attributes.' key)}}</label>
+                  <input type="text" name="system.statistics.{{key}}.value" value="{{statistic.value}}" data-dtype="Number"/>
                   <span >({{numberFormat statistic.x5 decimals=0 sign=false}}%)</span>
                 </div >
               </div>
@@ -87,22 +86,22 @@
     <div class="tab skills" data-group="primary" data-tab="skills">
       {{!-- Checkbox to hide/show skills that are at zero --}}
       <div>
-        <span class="resource-label" for="data.showUntrainedSkills">{{localize 'DG.UnnaturalSheet.HideUntrainedSkillsLabel'}}:</label>
-        <input class="labeled-resource-checkbox" type="checkbox" name="data.showUntrainedSkills" {{checked data.data.showUntrainedSkills}} data-dtype="Boolean" />
+        <span class="resource-label" for="system.showUntrainedSkills">{{localize 'DG.UnnaturalSheet.HideUntrainedSkillsLabel'}}:</label>
+        <input class="labeled-resource-checkbox" type="checkbox" name="system.showUntrainedSkills" {{checked actor.system.showUntrainedSkills}} data-dtype="Boolean" />
       </div>
 
       <div class="grid grid-3col">
-        {{#each actor.data.data.skills as |skill key|}}
+        {{#each actor.system.skills as |skill key|}}
           
-          {{#if (hideSkillBasedOnProficiencyAndUserChoice ../actor.data.data.showUntrainedSkills skill.proficiency)}}
+          {{#if (hideSkillBasedOnProficiencyAndUserChoice ../actor.system.showUntrainedSkills skill.proficiency)}}
           <div class="flexrow flex-group-center">
-            <label class="{{if_gt skill.proficiency 0 'rollable' 'not-rollable'}} skill-label" data-rolltype="skill" data-roll="d100" data-target="{{skill.proficiency}}" data-label="{{localize (concat 'DG.Skills.' key)}}" for="data.skills.{{key}}.value" 
+            <label class="{{if_gt skill.proficiency 0 'rollable' 'not-rollable'}} skill-label" data-rolltype="skill" data-roll="d100" data-target="{{skill.proficiency}}" data-label="{{localize (concat 'DG.Skills.' key)}}" for="system.skills.{{key}}.value" 
                 {{#if skill.proficiency}}title="{{localize 'DG.Tooltip.SkillLabel'}}"{{/if}}
                 {{#unless skill.proficiency}}title="{{localize 'DG.Tooltip.CannotRollSkillLabel'}}"{{/unless}}
               >
               {{ localize (concat "DG.Skills." key) }}
             </label>
-            <input class="percentile-skill-input" type="text" name="data.skills.{{key}}.proficiency" value="{{skill.proficiency}}" data-dtype="Number" {{#if skill.isCalculatedValue}} disabled {{/if}}/>
+            <input class="percentile-skill-input" type="text" name="system.skills.{{key}}.proficiency" value="{{skill.proficiency}}" data-dtype="Number" {{#if skill.isCalculatedValue}} disabled {{/if}}/>
             
           </div>
           {{/if}}
@@ -115,8 +114,8 @@
           <a class="item-control typed-skill-add"><i class="fas fa-plus"></i>{{localize 'DG.Skills.AddTypedOrCustomSkill'}}</a>
         </div>
         <div class="grid-2col">
-          {{#each actor.data.data.typedSkills as |skill key|}}
-            {{#if (hideSkillBasedOnProficiencyAndUserChoice ../actor.data.data.showUntrainedSkills skill.proficiency)}}
+          {{#each actor.system.typedSkills as |skill key|}}
+            {{#if (hideSkillBasedOnProficiencyAndUserChoice ../actor.system.showUntrainedSkills skill.proficiency)}}
             <div class="item flexrow flex-group-center">
               <label class="{{if_gt skill.proficiency 0 'rollable' 'not-rollable'}} skill-label" data-rolltype="skill" data-roll="d100" data-target="{{skill.proficiency}}" data-label="{{skill.label}}" 
                   {{#if skill.proficiency}}title="{{localize 'DG.Tooltip.SkillLabel'}}"{{/if}}
@@ -124,7 +123,7 @@
                 >
                 {{skill.group}} ({{skill.label}})
               </label>
-              <input class="percentile-skill-input" type="text" name="data.typedSkills.{{key}}.proficiency" value="{{skill.proficiency}}" data-dtype="Number"/>
+              <input class="percentile-skill-input" type="text" name="system.typedSkills.{{key}}.proficiency" value="{{skill.proficiency}}" data-dtype="Number"/>
               
               <div class="item-controls">
                   <a class="item-control typed-skill-delete" title="Delete Skill"><i class="fas fa-trash" data-typedskill="{{key}}" ></i></a>
@@ -140,7 +139,7 @@
       </div>
       <div class="unnatural-notes-section">
         <div class="editor-host">
-          {{editor content=actor.data.data.notes target="data.notes" button=true owner=owner editable=editable}}
+          {{editor enrichedDescription target="system.notes" button=true owner=owner editable=editable}}
         </div>
       </div>
       
@@ -177,32 +176,32 @@
                   class="item-name rollable" 
                   data-roll="d100"
                   data-rolltype="weaponskill" 
-                  data-target="{{item.data.data.skill}}"                         
-                  data-label="{{localizeWeaponSkill item.data.data.skill}}"
-                  title="{{localize 'DG.Tooltip.SkillLabel'}} ({{localizeWeaponSkill item.data.data.skill}})"
+                  data-target="{{item.system.skill}}"                         
+                  data-label="{{localizeWeaponSkill item.system.skill}}"
+                  title="{{localize 'DG.Tooltip.SkillLabel'}} ({{localizeWeaponSkill item.system.skill}})"
                   >
                     {{item.name}}
                 </h4>
 
-                {{#unless item.data.data.isLethal}}
+                {{#unless item.system.isLethal}}
                 <span class="rollable centered-item-property" 
                   
                   data-rolltype="damage" 
                   data-target="damage" 
                   data-label="{{toUpperCase item.name}}" 
-                  data-roll="{{toUpperCase item.data.data.damage}}"
-                  data-skill="{{item.data.data.skill}}"
+                  data-roll="{{toUpperCase item.system.damage}}"
+                  data-skill="{{item.system.skill}}"
                   >                      
-                  {{toUpperCase item.data.data.damage}}</span>
+                  {{toUpperCase item.system.damage}}</span>
                 {{/unless}}
 
-                {{#if item.data.data.isLethal}}
-                <span class="rollable  centered-item-property" data-rolltype="lethality" data-target="{{item.data.data.lethality}}" data-label="{{item.name}}" data-roll="d100"
+                {{#if item.system.isLethal}}
+                <span class="rollable  centered-item-property" data-rolltype="lethality" data-target="{{item.system.lethality}}" data-label="{{item.name}}" data-roll="d100"
                   title="{{localize 'DG.ItemWindow.Weapons.LethalityTooltip'}}"
-                  >{{formatLethality item.data.data.lethality}}</span>
+                  >{{formatLethality item.system.lethality}}</span>
                 {{/if}}
 
-                <span class="centered-item-property">{{item.data.data.armorPiercing}}</span>
+                <span class="centered-item-property">{{item.system.armorPiercing}}</span>
 
                 <div class="item-controls">
                     <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
@@ -238,10 +237,10 @@
               <li class="item flexrow" data-item-id="{{item.id}}">
                 <div class="item-image"><img src="{{item.img}}" title="{{item.name}}" width="24" height="24"/></div>
                 <h4 style="word-wrap: break-word;" class="item-name">{{item.name}}</h4>
-                <span class="centered-item-property">{{item.data.data.protection}}</span>
+                <span class="centered-item-property">{{item.system.protection}}</span>
                 
                 <span class="equipped-item centered-item-property" data-id="{{item.id}}" title="{{localize 'DG.Tooltip.ToggleEquippedState'}}">
-                  {{#if item.data.data.equipped}}
+                  {{#if item.system.equipped}}
                     <span class="fas fa-check"></span>
                   {{else}}
                     <span class="fas fa-times"></span>
@@ -288,7 +287,7 @@
                 
                 <span class="equipped-item centered-item-property" data-id="{{item.id}}" title="{{localize 'DG.Tooltip.ToggleEquippedState'}}" >
                   
-                  {{#if item.data.data.equipped}}
+                  {{#if item.system.equipped}}
                     <span class="fas fa-check"></span>
                   {{else}}
                     <span class="fas fa-times"></span>
diff --git a/templates/item/item-armor-sheet.html b/templates/item/item-armor-sheet.html
index c7a3d74..f89c01e 100644
--- a/templates/item/item-armor-sheet.html
+++ b/templates/item/item-armor-sheet.html
@@ -10,23 +10,23 @@
           <input name="name" type="text" value="{{item.name}}" placeholder="{{localize 'DG.ItemWindow.Armor.NamePlaceholder'}}"/></h1>
                         
           <span class="resource-label">{{localize 'DG.ItemWindow.Armor.Expense'}}:</span>
-          <select name="data.expense" >
-            <option {{#if_eq data.data.expense 'Incidental'}}selected{{/if_eq}} value="Incidental">{{localize 'DG.Gear.Expense.Incidental'}}</option>
-            <option {{#if_eq data.data.expense 'Standard'}}selected{{/if_eq}} value="Standard">{{localize 'DG.Gear.Expense.Standard'}}</option>
-            <option {{#if_eq data.data.expense 'Unusual'}}selected{{/if_eq}} value="Unusual">{{localize 'DG.Gear.Expense.Unusual'}}</option>
-            <option {{#if_eq data.data.expense 'Major'}}selected{{/if_eq}} value="Major">{{localize 'DG.Gear.Expense.Major'}}</option>
-            <option {{#if_eq data.data.expense 'Extreme'}}selected{{/if_eq}} value="Extreme">{{localize 'DG.Gear.Expense.Extreme'}}</option>
+          <select name="system.expense" >
+            <option {{#if_eq item.system.expense 'Incidental'}}selected{{/if_eq}} value="Incidental">{{localize 'DG.Gear.Expense.Incidental'}}</option>
+            <option {{#if_eq item.system.expense 'Standard'}}selected{{/if_eq}} value="Standard">{{localize 'DG.Gear.Expense.Standard'}}</option>
+            <option {{#if_eq item.system.expense 'Unusual'}}selected{{/if_eq}} value="Unusual">{{localize 'DG.Gear.Expense.Unusual'}}</option>
+            <option {{#if_eq item.system.expense 'Major'}}selected{{/if_eq}} value="Major">{{localize 'DG.Gear.Expense.Major'}}</option>
+            <option {{#if_eq item.system.expense 'Extreme'}}selected{{/if_eq}} value="Extreme">{{localize 'DG.Gear.Expense.Extreme'}}</option>
           </select>
         
           <span class="resource-label">{{localize 'DG.ItemWindow.Armor.Equipped'}}:</span>
-          <input class="labeled-resource-checkbox" type="checkbox" name="data.equipped" {{checked data.data.equipped}} data-dtype="Boolean" />          
+          <input class="labeled-resource-checkbox" type="checkbox" name="system.equipped" {{checked item.system.equipped}} data-dtype="Boolean" />          
               
         </div>
       </div>
       
       <div class="armor-sheet-secondary-grid-2col">
         <span class="resource-label">{{localize 'DG.ItemWindow.Armor.ArmorRating'}}:</span>
-        <input class="item-sheet-short-input" type="text" name="data.protection" value="{{data.data.protection}}" data-dtype="Number"/>
+        <input class="item-sheet-short-input" type="text" name="system.protection" value="{{item.system.protection}}" data-dtype="Number"/>
       </div>
       
     </header>
@@ -41,7 +41,7 @@
 
         {{!-- Description Tab --}}
         <div class="tab" data-group="primary" data-tab="description">
-            {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
+            {{editor enrichedDescription target="system.description" button=true owner=owner editable=editable}}
         </div>
     </section>
 </form>
diff --git a/templates/item/item-bond-sheet.html b/templates/item/item-bond-sheet.html
index a995800..4cb083b 100644
--- a/templates/item/item-bond-sheet.html
+++ b/templates/item/item-bond-sheet.html
@@ -9,12 +9,12 @@
                                 
                 <!-- <label class="resource-label">{{localize 'DG.Bonds.Score'}}</label> -->
                 <span class="resource-label">{{localize 'DG.Bonds.Score'}}:</span>
-                <input type="text" name="data.score" value="{{data.data.score}}" data-dtype="Number"
+                <input type="text" name="system.score" value="{{item.system.score}}" data-dtype="Number"
                     title="{{localize 'DG.ItemWindow.Bonds.ScoreTooltip'}}"
                 />            
             
                 <span class="resource-label">{{localize 'DG.Bonds.Relationship'}}:</span>
-                <input type="text" name="data.relationship" value="{{data.data.relationship}}" data-dtype="String" />
+                <input type="text" name="system.relationship" value="{{item.system.relationship}}" data-dtype="String" />
                 
             </div>
         </div>
@@ -30,7 +30,7 @@
 
         {{!-- Description Tab --}}
         <div class="tab" data-group="primary" data-tab="description">
-            {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
+            {{editor enrichedDescription target="system.description" button=true owner=owner editable=editable}}
         </div>
     </section>
 </form>
diff --git a/templates/item/item-gear-sheet.html b/templates/item/item-gear-sheet.html
index 22660f7..2a816b3 100644
--- a/templates/item/item-gear-sheet.html
+++ b/templates/item/item-gear-sheet.html
@@ -11,16 +11,16 @@
     
                 
                 <span class="resource-label">{{localize 'DG.ItemWindow.Gear.Expense'}}:</span>
-                <select name="data.expense" >
-                    <option {{#if_eq data.data.expense 'Incidental'}}selected{{/if_eq}} value="Incidental">{{localize 'DG.Gear.Expense.Incidental'}}</option>
-                    <option {{#if_eq data.data.expense 'Standard'}}selected{{/if_eq}} value="Standard">{{localize 'DG.Gear.Expense.Standard'}}</option>
-                    <option {{#if_eq data.data.expense 'Unusual'}}selected{{/if_eq}} value="Unusual">{{localize 'DG.Gear.Expense.Unusual'}}</option>
-                    <option {{#if_eq data.data.expense 'Major'}}selected{{/if_eq}} value="Major">{{localize 'DG.Gear.Expense.Major'}}</option>
-                    <option {{#if_eq data.data.expense 'Extreme'}}selected{{/if_eq}} value="Extreme">{{localize 'DG.Gear.Expense.Extreme'}}</option>
+                <select name="system.expense" >
+                    <option {{#if_eq item.system.expense 'Incidental'}}selected{{/if_eq}} value="Incidental">{{localize 'DG.Gear.Expense.Incidental'}}</option>
+                    <option {{#if_eq item.system.expense 'Standard'}}selected{{/if_eq}} value="Standard">{{localize 'DG.Gear.Expense.Standard'}}</option>
+                    <option {{#if_eq item.system.expense 'Unusual'}}selected{{/if_eq}} value="Unusual">{{localize 'DG.Gear.Expense.Unusual'}}</option>
+                    <option {{#if_eq item.system.expense 'Major'}}selected{{/if_eq}} value="Major">{{localize 'DG.Gear.Expense.Major'}}</option>
+                    <option {{#if_eq item.system.expense 'Extreme'}}selected{{/if_eq}} value="Extreme">{{localize 'DG.Gear.Expense.Extreme'}}</option>
                 </select>
                     
                 <span class="resource-label">{{localize 'DG.ItemWindow.Gear.Equipped'}}:</span>
-                <input class="labeled-resource-checkbox" type="checkbox" name="data.equipped" {{checked data.data.equipped}} data-dtype="Boolean" />
+                <input class="labeled-resource-checkbox" type="checkbox" name="system.equipped" {{checked item.system.equipped}} data-dtype="Boolean" />
                                     
             </div>
         </div>
@@ -38,7 +38,7 @@
 
         {{!-- Description Tab --}}
         <div class="tab" data-group="primary" data-tab="description">
-            {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
+            {{editor enrichedDescription target="system.description" button=true owner=owner editable=editable}}
         </div>
         
     </section>
diff --git a/templates/item/item-motivation-sheet.html b/templates/item/item-motivation-sheet.html
index 50a7956..94e8e2a 100644
--- a/templates/item/item-motivation-sheet.html
+++ b/templates/item/item-motivation-sheet.html
@@ -13,7 +13,7 @@
             
             <div class="motivation-sheet-horizontal-grid-2col">
                 <span class="resource-label">{{localize 'DG.ItemWindow.Motivations.IsDisorder'}}:</span>
-                <input type="checkbox" name="data.crossedOut" {{checked data.data.crossedOut}} data-dtype="Boolean" 
+                <input type="checkbox" name="system.crossedOut" {{checked item.system.crossedOut}} data-dtype="Boolean" 
                     title="{{localize 'DG.ItemWindow.Motivations.IsDisorderTooltip'}}"
                 />
            
@@ -25,7 +25,7 @@
                      title="{{localize 'DG.ItemWindow.Motivations.MotivationNameTooltip'}}"
                     
                     {{!-- If a motivation has been crossed off after a breaking point, do a strikeout on it and disable it. --}}
-                    {{#if data.data.crossedOut}}
+                    {{#if item.system.crossedOut}}
                         style="text-decoration: line-through;"
                         disabled
                     {{/if}}
@@ -33,17 +33,17 @@
             
 
             {{!-- Only Show the Disorders Section if Motivation Lost Checked --}}
-            {{#if data.data.crossedOut}}
+            {{#if item.system.crossedOut}}
             
                 <span class="resource-label">{{localize 'DG.ItemWindow.Motivations.Disorder'}}:</span>
-                <input type="text" name="data.disorder" value="{{data.data.disorder}}" data-dtype="String"
+                <input type="text" name="system.disorder" value="{{item.system.disorder}}" data-dtype="String"
                     
                     title="{{localize 'DG.ItemWindow.Motivations.DisorderNameTooltip'}}"
                 />
             
             
                 <span class="resource-label">{{localize 'DG.ItemWindow.Motivations.DisorderHasBeenCured'}}: </span>
-                <input class="labeled-resource-checkbox" type="checkbox" name="data.disorderCured" {{checked data.data.disorderCured}} data-dtype="Boolean" 
+                <input class="labeled-resource-checkbox" type="checkbox" name="system.disorderCured" {{checked item.system.disorderCured}} data-dtype="Boolean" 
                     title="{{localize 'DG.ItemWindow.Motivations.DisorderHasBeenCuredTooltip'}}"
                 />
             
@@ -54,7 +54,7 @@
         </div>
 
         <div class="tab attributes" data-group="primary" data-tab="description">
-            {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
+            {{editor enrichedDescription target="system.description" button=true owner=owner editable=editable}}
         </div>
         
     </section>
diff --git a/templates/item/item-weapon-sheet.html b/templates/item/item-weapon-sheet.html
index 2cb597e..c8e0c49 100644
--- a/templates/item/item-weapon-sheet.html
+++ b/templates/item/item-weapon-sheet.html
@@ -10,16 +10,16 @@
           <input name="name" type="text" value="{{item.name}}" placeholder="{{localize 'DG.ItemWindow.Weapons.NamePlaceholder'}}"/>
           
           <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.Expense'}}:</span>
-          <select name="data.expense" >
-            <option {{#if_eq data.data.expense 'Incidental'}}selected{{/if_eq}} value="Incidental">{{localize 'DG.Gear.Expense.Incidental'}}</option>
-            <option {{#if_eq data.data.expense 'Standard'}}selected{{/if_eq}} value="Standard">{{localize 'DG.Gear.Expense.Standard'}}</option>
-            <option {{#if_eq data.data.expense 'Unusual'}}selected{{/if_eq}} value="Unusual">{{localize 'DG.Gear.Expense.Unusual'}}</option>
-            <option {{#if_eq data.data.expense 'Major'}}selected{{/if_eq}} value="Major">{{localize 'DG.Gear.Expense.Major'}}</option>
-            <option {{#if_eq data.data.expense 'Extreme'}}selected{{/if_eq}} value="Extreme">{{localize 'DG.Gear.Expense.Extreme'}}</option>
+          <select name="system.expense" >
+            <option {{#if_eq item.system.expense 'Incidental'}}selected{{/if_eq}} value="Incidental">{{localize 'DG.Gear.Expense.Incidental'}}</option>
+            <option {{#if_eq item.system.expense 'Standard'}}selected{{/if_eq}} value="Standard">{{localize 'DG.Gear.Expense.Standard'}}</option>
+            <option {{#if_eq item.system.expense 'Unusual'}}selected{{/if_eq}} value="Unusual">{{localize 'DG.Gear.Expense.Unusual'}}</option>
+            <option {{#if_eq item.system.expense 'Major'}}selected{{/if_eq}} value="Major">{{localize 'DG.Gear.Expense.Major'}}</option>
+            <option {{#if_eq item.system.expense 'Extreme'}}selected{{/if_eq}} value="Extreme">{{localize 'DG.Gear.Expense.Extreme'}}</option>
           </select>
 
           <span class="resource-label">{{localize 'DG.ItemWindow.Gear.Equipped'}}:</span>
-          <input class="labeled-resource-checkbox" type="checkbox" name="data.equipped" {{checked data.data.equipped}} data-dtype="Boolean" />
+          <input class="labeled-resource-checkbox" type="checkbox" name="system.equipped" {{checked item.system.equipped}} data-dtype="Boolean" />
 
         </div>
       </div>
@@ -29,57 +29,57 @@
         <div class="weapon-sheet-horizontal-grid-left-2col">
 
           <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.Skill'}}:</span>
-          <select name="data.skill" >
-              <option {{#if_eq data.data.skill 'firearms'}}selected{{/if_eq}} value="firearms">{{localize 'DG.Skills.firearms'}}</option>
-              <option {{#if_eq data.data.skill 'melee_weapons'}}selected{{/if_eq}} value="melee_weapons">{{localize 'DG.Skills.melee_weapons'}}</option>
-              <option {{#if_eq data.data.skill 'unarmed_combat'}}selected{{/if_eq}} value="unarmed_combat">{{localize 'DG.Skills.unarmed_combat'}}</option>
-              <option {{#if_eq data.data.skill 'heavy_weapons'}}selected{{/if_eq}} value="heavy_weapons">{{localize 'DG.Skills.heavy_weapons'}}</option>
-              <option {{#if_eq data.data.skill 'athletics'}}selected{{/if_eq}} value="athletics">{{localize 'DG.Skills.athletics'}}</option>
-              <option {{#if_eq data.data.skill 'demolitions'}}selected{{/if_eq}} value="demolitions">{{localize 'DG.Skills.demolitions'}}</option>
-              <option {{#if_eq data.data.skill 'artillery'}}selected{{/if_eq}} value="artillery">{{localize 'DG.Skills.artillery'}}</option>
-              <option {{#if_eq data.data.skill 'str'}}selected{{/if_eq}} value="str">{{localize 'DG.Attributes.str'}}x5</option>
-              <option {{#if_eq data.data.skill 'con'}}selected{{/if_eq}} value="con">{{localize 'DG.Attributes.con'}}x5</option>
-              <option {{#if_eq data.data.skill 'dex'}}selected{{/if_eq}} value="dex">{{localize 'DG.Attributes.dex'}}x5</option>
-              <option {{#if_eq data.data.skill 'int'}}selected{{/if_eq}} value="int">{{localize 'DG.Attributes.int'}}x5</option>
-              <option {{#if_eq data.data.skill 'pow'}}selected{{/if_eq}} value="pow">{{localize 'DG.Attributes.pow'}}x5</option>
-              <option {{#if_eq data.data.skill 'cha'}}selected{{/if_eq}} value="cha">{{localize 'DG.Attributes.cha'}}x5</option>
+          <select name="system.skill" >
+              <option {{#if_eq item.system.skill 'firearms'}}selected{{/if_eq}} value="firearms">{{localize 'DG.Skills.firearms'}}</option>
+              <option {{#if_eq item.system.skill 'melee_weapons'}}selected{{/if_eq}} value="melee_weapons">{{localize 'DG.Skills.melee_weapons'}}</option>
+              <option {{#if_eq item.system.skill 'unarmed_combat'}}selected{{/if_eq}} value="unarmed_combat">{{localize 'DG.Skills.unarmed_combat'}}</option>
+              <option {{#if_eq item.system.skill 'heavy_weapons'}}selected{{/if_eq}} value="heavy_weapons">{{localize 'DG.Skills.heavy_weapons'}}</option>
+              <option {{#if_eq item.system.skill 'athletics'}}selected{{/if_eq}} value="athletics">{{localize 'DG.Skills.athletics'}}</option>
+              <option {{#if_eq item.system.skill 'demolitions'}}selected{{/if_eq}} value="demolitions">{{localize 'DG.Skills.demolitions'}}</option>
+              <option {{#if_eq item.system.skill 'artillery'}}selected{{/if_eq}} value="artillery">{{localize 'DG.Skills.artillery'}}</option>
+              <option {{#if_eq item.system.skill 'str'}}selected{{/if_eq}} value="str">{{localize 'DG.Attributes.str'}}x5</option>
+              <option {{#if_eq item.system.skill 'con'}}selected{{/if_eq}} value="con">{{localize 'DG.Attributes.con'}}x5</option>
+              <option {{#if_eq item.system.skill 'dex'}}selected{{/if_eq}} value="dex">{{localize 'DG.Attributes.dex'}}x5</option>
+              <option {{#if_eq item.system.skill 'int'}}selected{{/if_eq}} value="int">{{localize 'DG.Attributes.int'}}x5</option>
+              <option {{#if_eq item.system.skill 'pow'}}selected{{/if_eq}} value="pow">{{localize 'DG.Attributes.pow'}}x5</option>
+              <option {{#if_eq item.system.skill 'cha'}}selected{{/if_eq}} value="cha">{{localize 'DG.Attributes.cha'}}x5</option>
           </select>                              
 
           <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.IsLethality'}}:</span>
-          <input class="labeled-resource-checkbox" type="checkbox" name="data.isLethal" {{checked data.data.isLethal}} data-dtype="Boolean" 
+          <input class="labeled-resource-checkbox" type="checkbox" name="system.isLethal" {{checked item.system.isLethal}} data-dtype="Boolean" 
               title="{{localize 'DG.ItemWindow.Weapons.IsLethalityTooltip'}}"
           />
 
           <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.KillRadius'}}:</span>
-          <input type="text" name="data.killRadius" value="{{data.data.killRadius}}" data-dtype="String"/>
+          <input type="text" name="system.killRadius" value="{{item.system.killRadius}}" data-dtype="String"/>
           
         </div>
 
         <div class="weapon-sheet-horizontal-grid-right-2col">
         
           <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.Range'}}:</span>
-          <input type="text" name="data.range" value="{{data.data.range}}" data-dtype="String"/>
+          <input type="text" name="system.range" value="{{item.system.range}}" data-dtype="String"/>
 
           {{!-- If a weapon is 'Lethal', need to show the d100% Lethality input, otherwise only show the regular Damage formula (e.g. 1D6, 1D4+2, etc...) --}}
 
-          {{#unless data.data.isLethal}}
+          {{#unless item.system.isLethal}}
           
             <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.Damage'}}:</span>
-            <input type="text" name="data.damage" value="{{data.data.damage}}" data-dtype="String"/>
+            <input type="text" name="system.damage" value="{{item.system.damage}}" data-dtype="String"/>
           
           {{/unless}}
 
-          {{#if data.data.isLethal}}
+          {{#if item.system.isLethal}}
           
             <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.Lethality'}} %:</span>
-            <input class="" type="text" name="data.lethality" value="{{data.data.lethality}}" data-dtype="Number"
+            <input class="" type="text" name="system.lethality" value="{{item.system.lethality}}" data-dtype="Number"
               title="{{localize 'DG.ItemWindow.Weapons.LethalityTooltip'}}"
             />
           
           {{/if}}
           
           <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.ArmorPiercing'}}:</span>
-          <input type="text" name="data.armorPiercing" value="{{data.data.armorPiercing}}" data-dtype="Number"/>
+          <input type="text" name="system.armorPiercing" value="{{item.system.armorPiercing}}" data-dtype="Number"/>
  
         </div>
 
@@ -87,7 +87,7 @@
       
       <div class="weapon-sheet-secondary-grid-2col">
         <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.Ammo'}}:</span>
-        <input type="text" name="data.ammo" value="{{data.data.ammo}}" data-dtype="String"/>
+        <input type="text" name="system.ammo" value="{{item.system.ammo}}" data-dtype="String"/>
       </div>
          
     </header>
@@ -103,7 +103,7 @@
 
         {{!-- Description Tab --}}
         <div class="tab" data-group="primary" data-tab="description">
-            {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
+            {{editor enrichedDescription target="system.description" button=true owner=owner editable=editable}}
         </div>
     </section>
 </form>