diff --git a/module/applications/sheets/rollTables/rollTable.mjs b/module/applications/sheets/rollTables/rollTable.mjs
index c6ae7062..d6605e34 100644
--- a/module/applications/sheets/rollTables/rollTable.mjs
+++ b/module/applications/sheets/rollTables/rollTable.mjs
@@ -1,41 +1,41 @@
-//Setting RollTable
-
-//import DhRollTableData from 'systems/daggerheart/module/data/rollTable.mjs';
 export default class DhRollTableSheet extends foundry.applications.sheets.RollTableSheet {
-    static buildParts() {
-        const { footer, ...parts } = super.PARTS;
-        return {
-            ...parts,
-            summary: { template: 'systems/daggerheart/templates/sheets/rollTable/summary.hbs' },
-            footer
-        }
-    }
-    
-    static PARTS = DhRollTableSheet.buildParts();
-
     static DEFAULT_OPTIONS = {
         ...super.DEFAULT_OPTIONS,
-        classes: ['daggerheart', 'sheet', 'dh-style'],
-        actions : {
+        actions: {
             addAltFormula: DhRollTableSheet.#onAddAltFormula,
-         removeAltFormula: DhRollTableSheet.#onRemoveAltFormula
+            removeAltFormula: DhRollTableSheet.#onRemoveAltFormula
         }
     };
 
+    static buildParts() {
+        const { footer, ...parts } = super.PARTS;
+        const test = {
+            ...parts,
+            summary: { template: 'systems/daggerheart/templates/sheets/rollTable/summary.hbs' },
+            footer
+        };
+        return test;
+    }
+
+    static PARTS = DhRollTableSheet.buildParts();
+
     async _preparePartContext(partId, context, options) {
-        context = await super._preparePartContext(partId,context,options);
-        switch(partId) {
+        context = await super._preparePartContext(partId, context, options);
+
+        switch (partId) {
             case 'summary':
-                context.flagData = this.daggerheartFlag
+                context.flagData = this.daggerheartFlag;
                 break;
         }
+
         return context;
     }
 
-    async _preRender(context,options) {
-        await super._preFirstRender(context,options);
+    async _preRender(context, options) {
+        await super._preRender(context, options);
+
         if (!options.internalReferesh)
-            this.daggerheartFlag = new game.system.api.data.scenes.DHScene(this.document.flags.daggerheart)
+            this.daggerheartFlag = new game.system.api.data.DhRollTable(this.document.flags.daggerheart);
     }
 
     /** @override */
@@ -44,19 +44,8 @@ export default class DhRollTableSheet extends foundry.applications.sheets.RollTa
 
         super._processSubmitData(event, form, submitData, options);
     }
-    
-    static actions = {
-        addAltFormula: DhRollTableSheet.#onAddAltFormula,
-        removeAltFormula: DhRollTableSheet.#onRemoveAltFormula
-    };
 
-    //Add formulafield
-    static async #onAddAltFormula(event, target) {
-        
-    }
+    static async #onAddAltFormula(_event, target) {}
 
-    //Remove formulafield
-    static async #onRemoveAltFormula(event, target) {
-
-    }
+    static async #onRemoveAltFormula(_event, target) {}
 }
diff --git a/module/data/_module.mjs b/module/data/_module.mjs
index 0a476ee9..cc0df5e9 100644
--- a/module/data/_module.mjs
+++ b/module/data/_module.mjs
@@ -1,6 +1,7 @@
 export { default as DhCombat } from './combat.mjs';
 export { default as DhCombatant } from './combatant.mjs';
 export { default as DhTagTeamRoll } from './tagTeamRoll.mjs';
+export { default as DhRollTable } from './rollTable.mjs';
 
 export * as countdowns from './countdowns.mjs';
 export * as actions from './action/_module.mjs';
diff --git a/module/data/rollTable.mjs b/module/data/rollTable.mjs
index 28594c98..b1e90f51 100644
--- a/module/data/rollTable.mjs
+++ b/module/data/rollTable.mjs
@@ -1,28 +1,27 @@
+import FormulaField from './fields/formulaField.mjs';
+
 //Extra definitions for RollTable
-export default class DhRollTableData extends foundry.abstract.TypeDataModel {
-    static defineSchema(){
+export default class DhRollTable extends foundry.abstract.TypeDataModel {
+    static defineSchema() {
         const fields = foundry.data.fields;
 
-        return{
-            formulaName: new fields.StringField({ // This is to give a name to go together with the core.formula
-              required:true,
-              nullable: false,
-              initial: 'Formula' // Should be a translation
+        return {
+            formulaName: new fields.StringField({
+                // This is to give a name to go together with the core.formula
+                required: true,
+                nullable: false,
+                initial: 'Formula' // Should be a translation
             }),
             altFormula: new fields.ArrayField(
                 new fields.SchemaField({
                     key: new fields.StringField({
-                        required:false,
-                        nullable:false,
-                        blank:true
+                        required: false,
+                        nullable: false,
+                        blank: true
                     }),
-                    formula: new fields.StringField({
-                        required:true,
-                        blank:false,
-                        initial:"1d4" //Filler value
-                    })
+                    formula: new FormulaField()
                 })
             )
-        }
+        };
     }
-}
\ No newline at end of file
+}