diff --git a/app/models/measurement.js b/app/models/measurement.js
index 80b6136..41a7644 100644
--- a/app/models/measurement.js
+++ b/app/models/measurement.js
@@ -3,9 +3,7 @@ import DS from 'ember-data';
 export default DS.Model.extend({
   strain             : DS.belongsTo('strain', { async: false }),
   characteristic     : DS.belongsTo('characteristic', { async: false }),
-  textMeasurementType: DS.attr('string'),
-  txtValue           : DS.attr('string'),
-  numValue           : DS.attr('number'),
+  value              : DS.attr('string'),
   confidenceInterval : DS.attr('number'),
   unitType           : DS.attr('string'),
   notes              : DS.attr('string'),
@@ -14,17 +12,4 @@ export default DS.Model.extend({
   updatedAt          : DS.attr('date'),
   createdBy          : DS.attr('number'),
   updatedBy          : DS.attr('number'),
-
-  value: function() {
-    if (this.get('textMeasurementType')) {
-      return this.get('textMeasurementType');
-    }
-    if (this.get('txtValue')) {
-      return this.get('txtValue');
-    }
-    if (this.get('numValue')) {
-      return this.get('numValue');
-    }
-    return "error";
-  }.property('textMeasurementType', 'txtValue', 'numValue'),
 });
diff --git a/app/pods/protected/strains/show/measurements-table-row/component.js b/app/pods/protected/strains/show/measurements-table-row/component.js
index f973194..252e6e3 100644
--- a/app/pods/protected/strains/show/measurements-table-row/component.js
+++ b/app/pods/protected/strains/show/measurements-table-row/component.js
@@ -6,12 +6,15 @@ export default Ember.Component.extend({
 
   actions: {
     edit: function() {
+      // The parent table fetches all of the characteristics ahead of time
+      this.set('characteristics', this.store.peekAll('characteristic'));
       this.toggleProperty('isEditing');
     },
 
     save: function() {
       this.toggleProperty('isEditing');
-      console.log('saved');
-    }
+      this.get('row').save();
+    },
+    
   },
 });
diff --git a/app/pods/protected/strains/show/measurements-table-row/template.hbs b/app/pods/protected/strains/show/measurements-table-row/template.hbs
index b4f258e..bdf8566 100644
--- a/app/pods/protected/strains/show/measurements-table-row/template.hbs
+++ b/app/pods/protected/strains/show/measurements-table-row/template.hbs
@@ -1,16 +1,22 @@
 {{#if isEditing}}
   <td>
-    {{input value='Foo'}}
+    {{
+      select-2
+      multiple=false
+      content=characteristics
+      value=row.characteristic
+      optionLabelPath="characteristicName"
+    }}
   </td>
   <td>
-    {{input value='Bar'}}
+    {{input value=row.value}}
   </td>
   <td>
-    {{input value='Baz'}}
+    {{input value=row.notes}}
   </td>
   {{#if canEdit}}
     <td>
-      <button class="button-gray smaller" {{action 'save'}}>
+      <button class="button-red smaller" {{action 'save'}}>
         Save
       </button>
     </td>
@@ -22,10 +28,10 @@
     {{/link-to}}
   </td>
   <td>
-    {{row.measurement.value}}
+    {{row.value}}
   </td>
   <td>
-    {{row.measurement.notes}}
+    {{row.notes}}
   </td>
   {{#if canEdit}}
     <td>
diff --git a/app/pods/protected/strains/show/measurements-table/component.js b/app/pods/protected/strains/show/measurements-table/component.js
index bddc5d1..af846d0 100644
--- a/app/pods/protected/strains/show/measurements-table/component.js
+++ b/app/pods/protected/strains/show/measurements-table/component.js
@@ -5,21 +5,13 @@ export default Ember.Component.extend({
     return this.get('model.measurements.length') > 0;
   }.property('model.measurements'),
 
-  measurementsTable: function() {
-    let measurements = this.get('model.measurements');
-    let table = [];
-    measurements.forEach((measurement) => {
-      let row = {};
-      row['measurement'] = measurement;
-      row['characteristic'] = this.store.peekRecord('characteristic', measurement.get('characteristic.id'));
-      table.push(row);
-    });
-    table.sort((a, b) => {
-      let a_sort = a['characteristic'] && a['characteristic'].get('sortOrder');
-      let b_sort = b['characteristic'] && b['characteristic'].get('sortOrder');
-      return a_sort - b_sort;
-    });
-    return table;
-  }.property(),
+  fetchCharacteristics: function() {
+    if (this.get('canEdit')) {
+      this.store.findAll('characteristic');
+    }
+  }.on('didInsertElement'),
+
+  sortParams: ['characteristicTypeName', 'sortOrder', 'characteristicName'],
+  sortedMeasurements: Ember.computed.sort('model.measurements', 'sortParams'),
 
 });
diff --git a/app/pods/protected/strains/show/measurements-table/template.hbs b/app/pods/protected/strains/show/measurements-table/template.hbs
index c00490d..3f14ca7 100644
--- a/app/pods/protected/strains/show/measurements-table/template.hbs
+++ b/app/pods/protected/strains/show/measurements-table/template.hbs
@@ -23,10 +23,10 @@
     </tr>
   </thead>
   <tbody>
-    {{#each measurementsTable as |row|}}
+    {{#each sortedMeasurements as |measurement|}}
       {{
         protected/strains/show/measurements-table-row
-        row=row
+        row=measurement
         canEdit=canEdit
       }}
     {{/each}}
diff --git a/app/pods/protected/strains/strain-form/component.js b/app/pods/protected/strains/strain-form/component.js
index 3888156..0c96de3 100644
--- a/app/pods/protected/strains/strain-form/component.js
+++ b/app/pods/protected/strains/strain-form/component.js
@@ -4,6 +4,7 @@ export default Ember.Component.extend({
   actions: {
     save: function() {
       // Need to override the string id for some reason
+      // TODO: check this
       let strain = this.get('strain');
       let id = strain.get('species.id');
       strain.set('species.id', +id);