diff --git a/app/imports/api/creature/computation/combineStat.js b/app/imports/api/creature/computation/combineStat.js
index a475a4ec..5588d46e 100644
--- a/app/imports/api/creature/computation/combineStat.js
+++ b/app/imports/api/creature/computation/combineStat.js
@@ -44,11 +44,22 @@ function combineAttribute(stat, aggregator, memo){
     stat.dependencies.push(...dependencies);
   }
   stat.currentValue = stat.value - (stat.damage || 0);
+  // Ability scores get modifiers
   if (stat.attributeType === 'ability') {
     stat.modifier = Math.floor((stat.currentValue - 10) / 2);
   } else {
     stat.modifier = undefined;
   }
+  // Hit dice get constitution modifiers
+  stat.constitutionMod = undefined;
+  if (stat.attributeType === 'hitDice') {
+    let conStat = memo.statsByVariableName['constitution'];
+    if (conStat && 'modifier' in conStat){
+      stat.constitutionMod = conStat.modifier;
+      stat.dependencies.push(conStat._id, ...conStat.dependencies);
+    }
+  }
+  // Stats that have no effects can be hidden based on a sheet setting
   stat.hide = aggregator.hasNoEffects &&
     stat.baseValue === undefined ||
     undefined
diff --git a/app/imports/api/creature/computation/computeEndStepProperty.js b/app/imports/api/creature/computation/computeEndStepProperty.js
index 6317549c..cb143dbf 100644
--- a/app/imports/api/creature/computation/computeEndStepProperty.js
+++ b/app/imports/api/creature/computation/computeEndStepProperty.js
@@ -6,6 +6,10 @@ export default function computeEndStepProperty(prop, memo){
     case 'spell':
       computeAction(prop, memo);
       break;
+    case 'adjustment':
+    case 'damage':
+      computePropertyField(prop, memo, 'amount', 'compile');
+      break;
     case 'attack':
       computeAction(prop, memo);
       computeAttack(prop, memo);
diff --git a/app/imports/api/properties/Attributes.js b/app/imports/api/properties/Attributes.js
index c1b50619..aa60982f 100644
--- a/app/imports/api/properties/Attributes.js
+++ b/app/imports/api/properties/Attributes.js
@@ -122,6 +122,11 @@ let ComputedOnlyAttributeSchema = new SimpleSchema({
 		type: SimpleSchema.Integer,
 		optional: true,
 	},
+  // The computed creature constitution modifier
+  constitutionMod: {
+    type: Number,
+		optional: true,
+  },
   // Should this attribute hide
   hide: {
     type: Boolean,
diff --git a/app/imports/ui/components/computation/Computed.vue b/app/imports/ui/components/computation/Computed.vue
deleted file mode 100644
index 81c94303..00000000
--- a/app/imports/ui/components/computation/Computed.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<template lang="html">
-  <markdown-text
-    v-if="embedded"
-    :markdown="computedValue"
-  />
-  <div
-    v-else
-    class="computed"
-    :class="{
-      'symbols-are-errors': expectNumber && scope,
-      'code': errors.length,
-    }"
-    v-html="computedValue"
-  />
-</template>
-
-<script>
-import evaluateString from '/imports/api/creature/computation/afterComputation/evaluateString.js';
-import evalutateStringWithEmbeddedCalculations from '/imports/api/creature/computation/afterComputation/evalutateStringWithEmbeddedCalculations.js';
-import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
-import MarkdownText from '/imports/ui/components/MarkdownText.vue';
-
-export default {
-  components: {
-    MarkdownText,
-  },
-  props: {
-    value: {
-      type: String,
-      default: '',
-    },
-    scope: {
-      type: Object,
-      default: undefined,
-    },
-    expectNumber: {
-      type: Boolean,
-      default: true,
-    },
-    signed: {
-      type: Boolean
-    },
-    embedded: {
-      type: Boolean,
-    },
-  },
-  data(){return {
-    errors: false,
-    computedValue: '',
-  }},
-  watch: {
-    value(){
-      this.recalculate();
-    },
-    scope(){
-      this.recalculate();
-    },
-  },
-  mounted(){
-    this.recalculate();
-  },
-  methods: {
-    recalculate(){
-      if (!this.value) return;
-      if (this.embedded){
-        let result = evalutateStringWithEmbeddedCalculations(this.value, this.scope);
-        this.computedValue = result;
-      } else {
-        let {result, errors} = evaluateString(this.value, this.scope);
-        if (this.signed){
-          result = numberToSignedString(result);
-        }
-        this.computedValue = result;
-        this.errors = errors;
-      }
-    }
-  }
-}
-</script>
-
-<style lang="css">
-  .computed {
-    display: inline-block;
-  }
-  .computed.symbols-are-errors .math-symbol {
-    color: red;
-  }
-  .computed.code {
-    font-family: monospace,monospace;
-  }
-  .computed .math-binary-operator {
-    margin: 0 6px;
-  }
-</style>
diff --git a/app/imports/ui/components/computation/ComputedForCreature.vue b/app/imports/ui/components/computation/ComputedForCreature.vue
deleted file mode 100644
index a676a4fe..00000000
--- a/app/imports/ui/components/computation/ComputedForCreature.vue
+++ /dev/null
@@ -1,32 +0,0 @@
-<template lang="html">
-  <computed
-    :value="value"
-    :scope="scope"
-    v-bind="$attrs"
-  />
-</template>
-
-<script>
-import Computed from '/imports/ui/components/computation/Computed.vue';
-
-export default {
-  inject: {
-    context: { default: {} }
-  },
-  components: {
-    Computed,
-  },
-  props: {
-    value: {
-      type: String,
-      default: undefined,
-    },
-  },
-  computed: {
-    scope(){
-      return this.context.creature &&
-      this.context.creature.variables;
-    }
-  }
-}
-</script>
diff --git a/app/imports/ui/creature/slots/SlotFillDialog.vue b/app/imports/ui/creature/slots/SlotFillDialog.vue
index 89329cbe..277395b3 100644
--- a/app/imports/ui/creature/slots/SlotFillDialog.vue
+++ b/app/imports/ui/creature/slots/SlotFillDialog.vue
@@ -56,8 +56,8 @@
                     />
                   </h3>
                   <property-description
-                    v-if="node.description"
-                    :value="node.description"
+                    :string="model.description"
+                    :calculations="model.descriptionCalculations"
                   />
                 </div>
               </v-card-title>
diff --git a/app/imports/ui/properties/components/actions/ActionCard.vue b/app/imports/ui/properties/components/actions/ActionCard.vue
index d0a66727..aa0760b5 100644
--- a/app/imports/ui/properties/components/actions/ActionCard.vue
+++ b/app/imports/ui/properties/components/actions/ActionCard.vue
@@ -71,7 +71,10 @@
         />
       </template>
       <template v-if="model.summary">
-        <property-description :value="model.summary" />
+        <property-description
+          :string="model.summary"
+          :calculations="model.summaryCalculations"
+        />
         <v-divider
           v-if="children.length"
           class="my-2"
diff --git a/app/imports/ui/properties/components/attributes/HitDiceListTile.vue b/app/imports/ui/properties/components/attributes/HitDiceListTile.vue
index 997e1b03..1de4216a 100644
--- a/app/imports/ui/properties/components/attributes/HitDiceListTile.vue
+++ b/app/imports/ui/properties/components/attributes/HitDiceListTile.vue
@@ -53,22 +53,14 @@
       @mouseleave="hover = false"
     >
       <v-list-tile-title>
-        {{ model.hitDiceSize }} <computed
-          class="d-inline"
-          signed
-          value="constitution.modifier"
-        />
+        {{ model.hitDiceSize }} {{ model.constitutionMod }}
       </v-list-tile-title>
     </v-list-tile-content>
   </v-list-tile>
 </template>
 
 <script>
-import ComputedForCreature from '/imports/ui/components/computation/ComputedForCreature.vue';
 export default {
-  components: {
-    Computed: ComputedForCreature,
-  },
   inject: {
     context: { default: {} }
   },
diff --git a/app/imports/ui/properties/components/persona/NoteCard.vue b/app/imports/ui/properties/components/persona/NoteCard.vue
index b80dd03f..9af43ed2 100644
--- a/app/imports/ui/properties/components/persona/NoteCard.vue
+++ b/app/imports/ui/properties/components/persona/NoteCard.vue
@@ -11,7 +11,10 @@
       {{ model.name }}
     </v-card-title>
     <v-card-text>
-      <property-description :value="model.description" />
+      <property-description
+        :string="model.description"
+        :calculations="model.descriptionCalculations"
+      />
     </v-card-text>
   </v-card>
 </template>
diff --git a/app/imports/ui/properties/treeNodeViews/AdjustmentTreeNode.vue b/app/imports/ui/properties/treeNodeViews/AdjustmentTreeNode.vue
index 287c9e8f..46a64b5a 100644
--- a/app/imports/ui/properties/treeNodeViews/AdjustmentTreeNode.vue
+++ b/app/imports/ui/properties/treeNodeViews/AdjustmentTreeNode.vue
@@ -10,24 +10,15 @@
     <div
       class="text-no-wrap text-truncate"
     >
-      <computed
-        class="mr-1"
-        :value="model.amount"
-        :expect-number="false"
-      />
-      {{ model.stat }} damage
+      {{ model.amountResult }} {{ model.stat }} damage
     </div>
   </div>
 </template>
 
 <script>
 import treeNodeViewMixin from '/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js';
-import ComputedForCreature from '/imports/ui/components/computation/ComputedForCreature.vue';
 
 export default {
-  components: {
-    Computed: ComputedForCreature,
-  },
   mixins: [treeNodeViewMixin],
 }
 </script>
diff --git a/app/imports/ui/properties/treeNodeViews/DamageTreeNode.vue b/app/imports/ui/properties/treeNodeViews/DamageTreeNode.vue
index 6baf3fae..4f146aa9 100644
--- a/app/imports/ui/properties/treeNodeViews/DamageTreeNode.vue
+++ b/app/imports/ui/properties/treeNodeViews/DamageTreeNode.vue
@@ -11,30 +11,19 @@
     <div
       class="text-no-wrap text-truncate"
     >
-      <computed
-        class="mr-1"
-        :value="model.amount"
-        :expect-number="false"
-      />
-      <span class="mr-1">
-        {{ model.damageType }}
-      </span>
-      <span v-if="model.damageType !== 'healing'">
-        damage
-      </span>
+      {{ model.amountResult }}
+      {{ model.damageType }}<span
+        v-if="model.damageType !== 'healing'"
+      >&nbsp;damage</span>
     </div>
   </div>
 </template>
 
 <script>
 import treeNodeViewMixin from '/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js';
-import ComputedForCreature from '/imports/ui/components/computation/ComputedForCreature.vue';
 import { getPropertyIcon } from '/imports/constants/PROPERTIES.js';
 
 export default {
-  components: {
-    Computed: ComputedForCreature,
-  },
   mixins: [treeNodeViewMixin],
   computed: {
 		icon(){
diff --git a/app/imports/ui/properties/viewers/ActionViewer.vue b/app/imports/ui/properties/viewers/ActionViewer.vue
index ba9c295b..4c029408 100644
--- a/app/imports/ui/properties/viewers/ActionViewer.vue
+++ b/app/imports/ui/properties/viewers/ActionViewer.vue
@@ -102,13 +102,19 @@
       class="my-3"
     />
     <template v-if="model.summary">
-      <property-description :value="model.summary" />
+      <property-description
+        :string="model.summary"
+        :calculations="model.summaryCalculations"
+      />
       <v-divider
         v-if="model.description"
         class="my-3"
       />
     </template>
-    <property-description :value="model.description" />
+    <property-description
+      :string="model.description"
+      :calculations="model.descriptionCalculations"
+    />
   </div>
 </template>
 
diff --git a/app/imports/ui/properties/viewers/AdjustmentViewer.vue b/app/imports/ui/properties/viewers/AdjustmentViewer.vue
index cfa70ca0..54f81bea 100644
--- a/app/imports/ui/properties/viewers/AdjustmentViewer.vue
+++ b/app/imports/ui/properties/viewers/AdjustmentViewer.vue
@@ -1,21 +1,13 @@
 <template lang="html">
   <div class="adjustment-viewer layout row align-center">
-    <computed
-      class="mr-2"
-      :value="model.amount"
-      :expect-number="false"
-    /> {{ model.stat }} damage
+    {{ model.amountResult }} {{ model.stat }} damage
   </div>
 </template>
 
 <script>
 	import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js';
-  import ComputedForCreature from '/imports/ui/components/computation/ComputedForCreature.vue';
 
 	export default {
-    components: {
-      Computed: ComputedForCreature,
-    },
 		mixins: [propertyViewerMixin],
 	}
 </script>
diff --git a/app/imports/ui/properties/viewers/AttributeViewer.vue b/app/imports/ui/properties/viewers/AttributeViewer.vue
index 04f9be45..0b163d66 100644
--- a/app/imports/ui/properties/viewers/AttributeViewer.vue
+++ b/app/imports/ui/properties/viewers/AttributeViewer.vue
@@ -39,8 +39,8 @@
       :value="reset"
     />
     <property-description
-      v-if="model.description"
-      :value="model.description"
+      :string="model.description"
+      :calculations="model.descriptionCalculations"
     />
 
     <effect-viewer
diff --git a/app/imports/ui/properties/viewers/BuffViewer.vue b/app/imports/ui/properties/viewers/BuffViewer.vue
index cea4998b..69aa999c 100644
--- a/app/imports/ui/properties/viewers/BuffViewer.vue
+++ b/app/imports/ui/properties/viewers/BuffViewer.vue
@@ -6,8 +6,8 @@
       :value="model.duration"
     />
     <property-description
-      v-if="model.description"
-      :value="model.description"
+      :string="model.description"
+      :calculations="model.descriptionCalculations"
     />
   </div>
 </template>
diff --git a/app/imports/ui/properties/viewers/ContainerViewer.vue b/app/imports/ui/properties/viewers/ContainerViewer.vue
index 088346ee..cb18ccd8 100644
--- a/app/imports/ui/properties/viewers/ContainerViewer.vue
+++ b/app/imports/ui/properties/viewers/ContainerViewer.vue
@@ -44,8 +44,8 @@
       </div>
     </div>
     <property-description
-      v-if="model.description"
-      :value="model.description"
+      :string="model.description"
+      :calculations="model.descriptionCalculations"
     />
   </div>
 </template>
diff --git a/app/imports/ui/properties/viewers/DamageMultiplierViewer.vue b/app/imports/ui/properties/viewers/DamageMultiplierViewer.vue
index 7eafa526..5aa69763 100644
--- a/app/imports/ui/properties/viewers/DamageMultiplierViewer.vue
+++ b/app/imports/ui/properties/viewers/DamageMultiplierViewer.vue
@@ -17,6 +17,7 @@ export default {
 				case 0: return 'Immunity';
 				case 0.5: return 'Resistance';
 				case 2: return 'Vulnerability';
+        default: return '';
 			}
 		},
 	},
diff --git a/app/imports/ui/properties/viewers/DamageViewer.vue b/app/imports/ui/properties/viewers/DamageViewer.vue
index 3b9a0fb0..530ae4ba 100644
--- a/app/imports/ui/properties/viewers/DamageViewer.vue
+++ b/app/imports/ui/properties/viewers/DamageViewer.vue
@@ -1,25 +1,16 @@
 <template lang="html">
   <div class="damage-viewer layout row align-center">
-    <computed
-      class="mr-2"
-      :value="model.amount"
-      :expect-number="false"
-    />
-    {{ model.damageType }}
-    <span v-if="model.damageType !== 'healing'">
-      &nbsp;damage
-    </span>
+    {{ model.amountResult }}
+    {{ model.damageType }}<span
+      v-if="model.damageType !== 'healing'"
+    >&nbsp;damage</span>
   </div>
 </template>
 
 <script>
 	import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js';
-  import ComputedForCreature from '/imports/ui/components/computation/ComputedForCreature.vue';
 
 	export default {
-    components: {
-      Computed: ComputedForCreature,
-    },
 		mixins: [propertyViewerMixin],
 	}
 </script>
diff --git a/app/imports/ui/properties/viewers/FeatureViewer.vue b/app/imports/ui/properties/viewers/FeatureViewer.vue
index 59fda96d..64534f58 100644
--- a/app/imports/ui/properties/viewers/FeatureViewer.vue
+++ b/app/imports/ui/properties/viewers/FeatureViewer.vue
@@ -1,9 +1,15 @@
 <template lang="html">
   <div class="feature-viewer">
     <property-name :value="model.name" />
-    <property-description :value="model.summary" />
+    <property-description
+      :string="model.summary"
+      :calculations="model.summaryCalculations"
+    />
     <v-divider class="mt-3 mb-3" />
-    <property-description :value="model.description" />
+    <property-description
+      :string="model.description"
+      :calculations="model.descriptionCalculations"
+    />
   </div>
 </template>
 
diff --git a/app/imports/ui/properties/viewers/FolderViewer.vue b/app/imports/ui/properties/viewers/FolderViewer.vue
index 0a784889..48ae8589 100644
--- a/app/imports/ui/properties/viewers/FolderViewer.vue
+++ b/app/imports/ui/properties/viewers/FolderViewer.vue
@@ -1,7 +1,7 @@
 <template lang="html">
-	<div class="folder-viewer">
-		<property-name :value="model.name"/>
-	</div>
+  <div class="folder-viewer">
+    <property-name :value="model.name" />
+  </div>
 </template>
 
 <script>
diff --git a/app/imports/ui/properties/viewers/ItemViewer.vue b/app/imports/ui/properties/viewers/ItemViewer.vue
index ba69bc05..7fcdb8d2 100644
--- a/app/imports/ui/properties/viewers/ItemViewer.vue
+++ b/app/imports/ui/properties/viewers/ItemViewer.vue
@@ -109,8 +109,8 @@
       </div>
     </div>
     <property-description
-      v-if="model.description"
-      :value="model.description"
+      :string="model.description"
+      :calculations="model.descriptionCalculations"
     />
   </div>
 </template>
diff --git a/app/imports/ui/properties/viewers/NoteViewer.vue b/app/imports/ui/properties/viewers/NoteViewer.vue
index cc8a725a..2a134a75 100644
--- a/app/imports/ui/properties/viewers/NoteViewer.vue
+++ b/app/imports/ui/properties/viewers/NoteViewer.vue
@@ -2,8 +2,8 @@
   <div class="note-viewer">
     <property-name :value="model.name" />
     <property-description
-      v-if="model.description"
-      :value="model.description"
+      :string="model.description"
+      :calculations="model.descriptionCalculations"
     />
   </div>
 </template>
diff --git a/app/imports/ui/properties/viewers/ProficiencyViewer.vue b/app/imports/ui/properties/viewers/ProficiencyViewer.vue
index 87a12a2e..3b682e45 100644
--- a/app/imports/ui/properties/viewers/ProficiencyViewer.vue
+++ b/app/imports/ui/properties/viewers/ProficiencyViewer.vue
@@ -1,12 +1,15 @@
 <template lang="html">
   <div class="proficiency-viewer">
-		<div class="headline layout row">
-			{{model.skill}}
-			<proficiency-icon :value="model.value" class="ml-3 mr-1"/>
-			<div>
-				{{proficiencyText}}
-			</div>
-		</div>
+    <div class="headline layout row">
+      {{ model.skill }}
+      <proficiency-icon
+        :value="model.value"
+        class="ml-3 mr-1"
+      />
+      <div>
+        {{ proficiencyText }}
+      </div>
+    </div>
   </div>
 </template>
 
@@ -14,21 +17,19 @@
 import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js';
 import ProficiencyIcon from '/imports/ui/properties/shared/ProficiencyIcon.vue';
 export default {
-	mixins: [propertyViewerMixin],
 	components: {
 		ProficiencyIcon,
 	},
+	mixins: [propertyViewerMixin],
 	computed: {
 		proficiencyText(){
 			switch (this.model.value){
-				case 0.5: return "Half proficiency bonus";
-				case 1: return "Proficient";
-				case 2: return "Double proficiency bonus";
+				case 0.5: return 'Half proficiency bonus';
+				case 1: return 'Proficient';
+				case 2: return 'Double proficiency bonus';
+        default: return '';
 			}
 		}
 	}
 }
 </script>
-
-<style lang="css" scoped>
-</style>
diff --git a/app/imports/ui/properties/viewers/SkillViewer.vue b/app/imports/ui/properties/viewers/SkillViewer.vue
index 1e3c2160..9194f08f 100644
--- a/app/imports/ui/properties/viewers/SkillViewer.vue
+++ b/app/imports/ui/properties/viewers/SkillViewer.vue
@@ -35,8 +35,8 @@
       :value="model.baseProficiency"
     />
     <property-description
-      v-if="model.description"
-      :value="model.description"
+      :string="model.description"
+      :calculations="model.descriptionCalculations"
     />
 
     <effect-viewer
diff --git a/app/imports/ui/properties/viewers/SpellListViewer.vue b/app/imports/ui/properties/viewers/SpellListViewer.vue
index afcb35cd..402eec44 100644
--- a/app/imports/ui/properties/viewers/SpellListViewer.vue
+++ b/app/imports/ui/properties/viewers/SpellListViewer.vue
@@ -7,8 +7,8 @@
       :value="model.maxPreparedResult"
     />
     <property-description
-      v-if="model.description"
-      :value="model.description"
+      :string="model.description"
+      :calculations="model.descriptionCalculations"
     />
   </div>
 </template>
@@ -19,6 +19,3 @@ export default {
 	mixins: [propertyViewerMixin],
 }
 </script>
-
-<style lang="css" scoped>
-</style>
diff --git a/app/imports/ui/properties/viewers/SpellViewer.vue b/app/imports/ui/properties/viewers/SpellViewer.vue
index bd082048..55d445ec 100644
--- a/app/imports/ui/properties/viewers/SpellViewer.vue
+++ b/app/imports/ui/properties/viewers/SpellViewer.vue
@@ -18,8 +18,8 @@
       :value="`${model.level} ${model.school}`"
     />
     <property-description
-      v-if="model.description"
-      :value="model.description"
+      :string="model.description"
+      :calculations="model.descriptionCalculations"
     />
   </div>
 </template>
diff --git a/app/imports/ui/properties/viewers/shared/PropertyDescription.vue b/app/imports/ui/properties/viewers/shared/PropertyDescription.vue
index afd4c0e9..d68eb51c 100644
--- a/app/imports/ui/properties/viewers/shared/PropertyDescription.vue
+++ b/app/imports/ui/properties/viewers/shared/PropertyDescription.vue
@@ -1,21 +1,30 @@
 <template lang="html">
   <computed
-    v-if="value"
+    v-if="string"
     class="property-description"
-    embedded
-    :value="value"
+    :string="string"
+    :calculations="calculations"
   />
 </template>
 
 <script>
-import ComputedForCreature from '/imports/ui/components/computation/ComputedForCreature.vue';
+import EmbedInlineComputations from 'imports/ui/components/computation/EmbedInlineComputations.vue';
 
 export default {
 	components: {
-    Computed: ComputedForCreature,
+    Computed: EmbedInlineComputations,
 	},
 	props: {
-		value: String,
+		string: {
+      type: String,
+      default: '',
+    },
+    calculations: {
+      type: Array,
+      default(){
+        return [];
+      },
+    },
 	},
 }
 </script>