diff --git a/app/pods/protected/strains/edit/route.js b/app/pods/protected/strains/edit/route.js
index 94a7710..6bb9b2f 100644
--- a/app/pods/protected/strains/edit/route.js
+++ b/app/pods/protected/strains/edit/route.js
@@ -17,6 +17,7 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
 
   setupController: function(controller, models) {
     controller.setProperties(models);
+    controller.set('metaData', this.store.metadataFor('strain'));
   },
 
 });
diff --git a/app/pods/protected/strains/edit/template.hbs b/app/pods/protected/strains/edit/template.hbs
index d9c4d43..a4885d6 100644
--- a/app/pods/protected/strains/edit/template.hbs
+++ b/app/pods/protected/strains/edit/template.hbs
@@ -2,6 +2,7 @@
   protected/strains/strain-form
   strain=strain
   species=species
+  canAdd=metaData.canAdd
   save="save"
   cancel="cancel"
 }}
diff --git a/app/pods/protected/strains/show/measurements-table/component.js b/app/pods/protected/strains/show/measurements-table/component.js
index af846d0..3fe5de5 100644
--- a/app/pods/protected/strains/show/measurements-table/component.js
+++ b/app/pods/protected/strains/show/measurements-table/component.js
@@ -11,7 +11,19 @@ export default Ember.Component.extend({
     }
   }.on('didInsertElement'),
 
-  sortParams: ['characteristicTypeName', 'sortOrder', 'characteristicName'],
+  sortParams: ['characteristic.characteristicTypeName', 'characteristic.sortOrder', 'characteristic.characteristicName'],
   sortedMeasurements: Ember.computed.sort('model.measurements', 'sortParams'),
 
+  actions: {
+    addCharacteristic: function() {
+      const c = this.store.createRecord('characteristic', {
+        sortOrder: -999
+      })
+      const m = this.store.createRecord('measurement', {
+        characteristic: c
+      });
+      this.get('model.measurements').addObject(m);
+    },
+  },
+
 });
diff --git a/app/pods/protected/strains/show/measurements-table/template.hbs b/app/pods/protected/strains/show/measurements-table/template.hbs
index ced8028..2f30a9e 100644
--- a/app/pods/protected/strains/show/measurements-table/template.hbs
+++ b/app/pods/protected/strains/show/measurements-table/template.hbs
@@ -1,3 +1,11 @@
+{{#if canAdd}}
+<br>
+<button class="button-green smaller" {{action "addCharacteristic"}}>
+  Add characteristic
+</button>
+<br><br>
+{{/if}}
+
 {{#if measurementsPresent}}
 <table class="flakes-table">
   <colgroup>
diff --git a/app/pods/protected/strains/show/template.hbs b/app/pods/protected/strains/show/template.hbs
index dbe09fe..e16634a 100644
--- a/app/pods/protected/strains/show/template.hbs
+++ b/app/pods/protected/strains/show/template.hbs
@@ -77,6 +77,7 @@
             protected/strains/show/measurements-table
             model=model
             canEdit=false
+            canAdd=false
           }}
         </dd>
       </dl>
diff --git a/app/pods/protected/strains/strain-form/template.hbs b/app/pods/protected/strains/strain-form/template.hbs
index 8260411..cf33026 100644
--- a/app/pods/protected/strains/strain-form/template.hbs
+++ b/app/pods/protected/strains/strain-form/template.hbs
@@ -54,6 +54,7 @@
       protected/strains/show/measurements-table
       model=strain
       canEdit=strain.canEdit
+      canAdd=canAdd
     }}
   </div>
   <br>