diff --git a/app/imports/api/creature/computation/engine/computeEndStepProperty.js b/app/imports/api/creature/computation/engine/computeEndStepProperty.js
index 8d6b90d7..931b3d16 100644
--- a/app/imports/api/creature/computation/engine/computeEndStepProperty.js
+++ b/app/imports/api/creature/computation/engine/computeEndStepProperty.js
@@ -14,16 +14,19 @@ export default function computeEndStepProperty(prop, memo){
       break;
     case 'attack':
       computeAction(prop, memo);
-      computeAttack(prop, memo);
+      computePropertyField(prop, memo, 'rollBonus');
       break;
     case 'savingThrow':
-      computeSavingThrow(prop, memo);
+      computePropertyField(prop, memo, 'dc');
       break;
     case 'spellList':
-      computeSpellList(prop, memo);
+      computePropertyField(prop, memo, 'maxPrepared');
       break;
     case 'propertySlot':
-      computeSlot(prop, memo);
+      computePropertyField(prop, memo, 'slotCondition');
+      break;
+    case 'roll':
+      computePropertyField(prop, memo, 'roll', 'compile');
       break;
   }
 }
@@ -111,19 +114,3 @@ function computePropertyField(prop, memo, fieldName, fn){
     delete prop[`${fieldName}Errors`];
   }
 }
-
-function computeAttack(prop, memo){
-  computePropertyField(prop, memo, 'rollBonus');
-}
-
-function computeSavingThrow(prop, memo){
-  computePropertyField(prop, memo, 'dc');
-}
-
-function computeSpellList(prop, memo){
-  computePropertyField(prop, memo, 'maxPrepared');
-}
-
-function computeSlot(prop, memo){
-  computePropertyField(prop, memo, 'slotCondition');
-}
diff --git a/app/imports/ui/properties/viewers/RollViewer.vue b/app/imports/ui/properties/viewers/RollViewer.vue
new file mode 100644
index 00000000..789b80e5
--- /dev/null
+++ b/app/imports/ui/properties/viewers/RollViewer.vue
@@ -0,0 +1,23 @@
+<template lang="html">
+  <div class="buff-viewer">
+    <property-name :value="model.name" />
+    <property-variable-name :value="model.variableName" />
+    <property-field
+      name="Roll"
+      :value="model.rollResult || model.roll"
+    />
+    <calculation-error-list :errors="model.rollErrors" />
+  </div>
+</template>
+
+<script>
+	import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+  import CalculationErrorList from '/imports/ui/properties/forms/shared/CalculationErrorList.vue';
+
+	export default {
+    components: {
+      CalculationErrorList,
+    },
+		mixins: [propertyViewerMixin],
+	}
+</script>
diff --git a/app/imports/ui/properties/viewers/shared/propertyViewerIndex.js b/app/imports/ui/properties/viewers/shared/propertyViewerIndex.js
index 7e3447d9..4db79add 100644
--- a/app/imports/ui/properties/viewers/shared/propertyViewerIndex.js
+++ b/app/imports/ui/properties/viewers/shared/propertyViewerIndex.js
@@ -14,7 +14,7 @@ import FolderViewer from '/imports/ui/properties/viewers/FolderViewer.vue';
 import ItemViewer from '/imports/ui/properties/viewers/ItemViewer.vue';
 import NoteViewer from '/imports/ui/properties/viewers/NoteViewer.vue';
 import ProficiencyViewer from '/imports/ui/properties/viewers/ProficiencyViewer.vue';
-//import RollViewer from '/imports/ui/properties/viewers/RollViewer.vue';
+import RollViewer from '/imports/ui/properties/viewers/RollViewer.vue';
 import SkillViewer from '/imports/ui/properties/viewers/SkillViewer.vue';
 import SpellListViewer from '/imports/ui/properties/viewers/SpellListViewer.vue';
 import SpellViewer from '/imports/ui/properties/viewers/SpellViewer.vue';
@@ -36,7 +36,7 @@ export default {
   item: ItemViewer,
   note: NoteViewer,
   proficiency: ProficiencyViewer,
-//  roll: RollViewer,
+  roll: RollViewer,
   skill: SkillViewer,
   spellList: SpellListViewer,
   spell: SpellViewer,