diff --git a/app/imports/api/properties/Attributes.js b/app/imports/api/properties/Attributes.js
index b191c2dd..33b32615 100644
--- a/app/imports/api/properties/Attributes.js
+++ b/app/imports/api/properties/Attributes.js
@@ -38,6 +38,11 @@ let AttributeSchema = new SimpleSchema({
 		type: Number,
 		optional: true,
 	},
+  // Description of what the attribute is used for
+  description: {
+		type: String,
+		optional: true,
+	},
 	// The damage done to the attribute, always positive
   damage: {
     type: SimpleSchema.Integer,
diff --git a/app/imports/ui/properties/forms/AttributeForm.vue b/app/imports/ui/properties/forms/AttributeForm.vue
index 04985d68..cbc79cf2 100644
--- a/app/imports/ui/properties/forms/AttributeForm.vue
+++ b/app/imports/ui/properties/forms/AttributeForm.vue
@@ -40,6 +40,13 @@
 			:hint="attributeTypeHints[model.attributeType]"
 			:debounce-time="debounceTime"
 		/>
+		<text-area
+			label="Description"
+			:value="model.description"
+			:error-messages="errors.description"
+			@change="(value, ack) => $emit('change', {path: ['description'], value, ack})"
+			:debounce-time="debounceTime"
+		/>
 		<form-section name="Advanced" standalone>
 			<div class="layout column align-center">
 				<v-switch
diff --git a/app/imports/ui/properties/viewers/AttributeViewer.vue b/app/imports/ui/properties/viewers/AttributeViewer.vue
index 429ceccb..930f8dc1 100644
--- a/app/imports/ui/properties/viewers/AttributeViewer.vue
+++ b/app/imports/ui/properties/viewers/AttributeViewer.vue
@@ -1,25 +1,61 @@
 <template lang="html">
 	<div class="attribute-viewer">
+		<div v-if="model.value !== undefined">
+			<div class="display-3" v-if="model.damage !== undefined">
+				{{model.value - model.damage}} / {{model.value}}
+			</div>
+			<div v-else>
+				{{model.value}}
+			</div>
+		</div>
+		<div v-if="model.mod !== undefined">
+			{{numberToSignedString(model.mod)}}
+		</div>
 		<div class="title">
 			{{model.name}}
 		</div>
-		<div class="caption">
-			({{model.variableName}})
+		<div>
+			<code>{{model.variableName}}</code>
 		</div>
-		
+		<div>
+			{{model.attributeType}}
+		</div>
+		<div>
+			Base value: {{model.baseValue}}
+		</div>
+		<div v-if="reset">
+			{{reset}}
+		</div>
+		<div v-if="model.resetMultiplier">
+			Reset multiplier: {{model.resetMultiplier}}
+		</div>
+		<p v-if="model.description">
+			{{model.description}}
+		</p>
 	</div>
 </template>
 
 <script>
-import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
+	import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
 
 	export default {
 		props: {
 			model: Object,
+			required: true,
 		},
 		methods: {
 			numberToSignedString,
 		},
+		computed: {
+			reset(){
+				let reset = this.model.reset
+				if (reset === 'shortRest'){
+					return 'Reset on a short rest';
+				} else if (reset === 'longRest'){
+					return 'Reset on a long rest';
+				}
+			}
+		}
 	}
 </script>