diff --git a/app/imports/api/creature/computation/ComputationMemo.js b/app/imports/api/creature/computation/ComputationMemo.js
index e81a0f5d..5e76958f 100644
--- a/app/imports/api/creature/computation/ComputationMemo.js
+++ b/app/imports/api/creature/computation/ComputationMemo.js
@@ -1,4 +1,4 @@
-import { includes, cloneDeep } from 'lodash';
+import { includes, cloneDeep, has } from 'lodash';
 
 export default class ComputationMemo {
   constructor(props){
@@ -8,8 +8,12 @@ export default class ComputationMemo {
     this.skillsByAbility = {};
     this.unassignedEffects = [];
     props.filter((prop) => {
-      // skip effects and proficiencies for the next pass
-      if (prop.type === 'effect' || prop.type === 'proficiency') return true;
+      // skip effects, proficiencies, and class levels for the next pass
+      if (
+        prop.type === 'effect' ||
+        prop.type === 'proficiency' ||
+        prop.type === 'classLevel'
+      ) return true;
       // Add all the stats
       this.addStat(prop);
     }).forEach((prop) => {
@@ -18,6 +22,8 @@ export default class ComputationMemo {
         this.addEffect(prop);
       } else if (prop.type === 'proficiency') {
         this.addProficiency(prop);
+      } else if (prop.type === 'classLevel'){
+        this.addClassLevel(prop);
       }
     });
   }
@@ -27,6 +33,27 @@ export default class ComputationMemo {
     prop.computationDetails = propDetails(prop);
     return prop;
   }
+  storeHighestClassLevel(name, prop){
+    // Only store the highest level classLevel
+    let stat = this.statsByVariableName[name]
+    if (!stat){
+      this.statsByVariableName[name] = prop;
+    } else if (!has(stat, 'level')){
+      // Stat is overriden by an attribute
+      return;
+    } else if (stat.level < prop.level) {
+      this.statsByVariableName[name] = prop;
+    }
+  }
+  addClassLevel(prop){
+    prop = this.registerProperty(prop);
+    if (prop.variableName){
+      this.storeHighestClassLevel(prop.variableName, prop);
+    }
+    if (prop.baseClass){
+      this.storeHighestClassLevel(prop.baseClass, prop);
+    }
+  }
   addStat(prop){
     prop = this.registerProperty(prop);
     let variableName = prop.variableName;
@@ -146,6 +173,11 @@ const propDetailsByType = {
       computed: false,
     };
   },
+  classLevel(){
+    return {
+      computed: true,
+    };
+  },
   proficiency(){
     return {};
   },
diff --git a/app/imports/api/creature/computation/getCalculationProperties.js b/app/imports/api/creature/computation/getCalculationProperties.js
index f21c9d15..27a7ebd2 100644
--- a/app/imports/api/creature/computation/getCalculationProperties.js
+++ b/app/imports/api/creature/computation/getCalculationProperties.js
@@ -36,6 +36,7 @@ export default function getCalculationProperties(creatureId){
       'damageMultiplier',
       'effect',
       'proficiency',
+      'classLevel',
     ]},
   }).fetch();
 }
diff --git a/app/imports/api/creature/computation/writeCreatureVariables.js b/app/imports/api/creature/computation/writeCreatureVariables.js
index 5255a1b9..7ab7aa95 100644
--- a/app/imports/api/creature/computation/writeCreatureVariables.js
+++ b/app/imports/api/creature/computation/writeCreatureVariables.js
@@ -23,6 +23,7 @@ export default function writeCreatureVariables(memo, creatureId) {
     'conditionalBenefits',
     'rollBonuses',
     'fail',
+    'level',
   ];
 
   memo.creatureVariables = {};