diff --git a/app/pods/protected/strains/edit/controller.js b/app/pods/protected/strains/edit/controller.js
index 2591853..9685884 100644
--- a/app/pods/protected/strains/edit/controller.js
+++ b/app/pods/protected/strains/edit/controller.js
@@ -1,21 +1,61 @@
 import Ember from 'ember';
-import SaveModel from '../../../../mixins/save-model';
 import ajaxError from '../../../../utils/ajax-error';
 
-const { Controller } = Ember;
+const { Controller, RSVP } = Ember;
 
-export default Controller.extend(SaveModel, {
-  // Required for SaveModel mixin
+export default Controller.extend({
   fallbackRouteSave: 'protected.strains.show',
   fallbackRouteCancel: 'protected.strains.show',
 
   actions: {
-    save: function(properties, deleteQueue) {
-      deleteQueue.forEach((val) => {
-        val.destroyRecord();
+    save: function(properties, deleteQueue, updateQueue) {
+      let promises = [];
+      properties.measurements.forEach((measurement) => {
+        if (measurement.get('isNew')) {
+          promises.push(measurement.save().catch(() => {
+            ajaxError(measurement.get('errors'), this.get('flashMessages'));
+          }));
+        }
       });
 
-      this._super(properties);
+      updateQueue.forEach((measurement) => {
+        promises.push(measurement.save().catch(() => {
+          ajaxError(measurement.get('errors'), this.get('flashMessages'));
+        }));
+      });
+
+      deleteQueue.forEach((measurement) => {
+        promises.push(measurement.destroyRecord().catch(() => {
+          ajaxError(measurement.get('errors'), this.get('flashMessages'));
+        }));
+      });
+
+      const model = this.get('model');
+      const fallbackRoute = this.get('fallbackRouteSave');
+
+      RSVP.all(promises).then(() => {
+        // Can't call _super inside promise :-(
+        model.setProperties(properties);
+        model.save().then((model) => {
+          this.get('flashMessages').clearMessages();
+          this.transitionToRoute(fallbackRoute, model);
+        }, () => {
+          ajaxError(model.get('errors'), this.get('flashMessages'));
+        });
+      });
+    },
+
+    cancel: function() {
+      const model = this.get('model');
+
+      model.get('errors').clear();
+      model.rollbackAttributes();
+
+      if (model.get('isNew')) {
+        this.transitionToRoute(this.get('fallbackRouteCancel'));
+      } else {
+        this.transitionToRoute(this.get('fallbackRouteCancel'), model);
+      }
     },
 
     addCharacteristic: function() {
@@ -24,14 +64,5 @@ export default Controller.extend(SaveModel, {
       });
     },
 
-    saveMeasurement: function(measurement, properties) {
-      measurement.setProperties(properties);
-      return measurement.save().then(() => {
-        this.get('flashMessages').clearMessages();
-      }, () => {
-        ajaxError(measurement.get('errors'), this.get('flashMessages'));
-      });
-    },
-
   },
 });
diff --git a/app/pods/protected/strains/edit/template.hbs b/app/pods/protected/strains/edit/template.hbs
index f252090..727510c 100644
--- a/app/pods/protected/strains/edit/template.hbs
+++ b/app/pods/protected/strains/edit/template.hbs
@@ -4,7 +4,6 @@
   speciesList=speciesList
   add-characteristic=(action "addCharacteristic")
   allCharacteristics=allCharacteristics
-  save-measurement=(action "saveMeasurement")
   on-save=(action "save")
   on-cancel=(action "cancel")
 }}
diff --git a/app/pods/protected/strains/measurements-table-row/component.js b/app/pods/protected/strains/measurements-table-row/component.js
index 61a60fb..6b67968 100644
--- a/app/pods/protected/strains/measurements-table-row/component.js
+++ b/app/pods/protected/strains/measurements-table-row/component.js
@@ -11,6 +11,7 @@ export default Component.extend({
   measurement: null,
   isDirty: null,
   isNew: false,
+  isQueued: false,
 
   // Actions
   "save-measurement": null,
@@ -33,9 +34,12 @@ export default Component.extend({
     });
     // Read-only attributes
     this.set('isNew', this.get('measurement.isNew'));
-    if (this.get('isNew')) {
+    if (this.get('isNew') && !this.get('isQueued')) {
       this.set('isEditing', true);
+    } else {
+      this.set('isEditing', false);
     }
+    this.set('isDirty', false);
   },
 
   updateField: function(property, value) {
@@ -54,10 +58,9 @@ export default Component.extend({
     },
 
     save: function() {
-      this.attrs['save-measurement'](this.get('measurement'), this.getProperties(this.get('propertiesList'))).then(() => {
-        this._resetProperties();
-        this.set('isEditing', false);
-      });
+      this.attrs['save-measurement'](this.get('measurement'), this.getProperties(this.get('propertiesList')));
+      this.set('isQueued', true);
+      this._resetProperties();
     },
 
     cancel: function() {
diff --git a/app/pods/protected/strains/measurements-table/component.js b/app/pods/protected/strains/measurements-table/component.js
index e4fd3a1..49734f3 100644
--- a/app/pods/protected/strains/measurements-table/component.js
+++ b/app/pods/protected/strains/measurements-table/component.js
@@ -5,7 +5,7 @@ const { sort } = computed;
 
 export default Component.extend({
   // Passed in
-  strain: null,
+  measurements: null,
   allCharacteristics: null,
   canEdit: false,
   canAdd: false,
@@ -19,15 +19,15 @@ export default Component.extend({
   sortParams: ['characteristic.characteristicTypeName', 'characteristic.sortOrder', 'characteristic.characteristicName'],
   sortAsc: true,
   paramsChanged: false,
-  sortedMeasurements: sort('strain.measurements', 'sortParams'),
-  measurementsPresent: computed('strain.measurements', function() {
-    return this.get('strain.measurements.length') > 0;
+  sortedMeasurements: sort('measurements', 'sortParams'),
+  measurementsPresent: computed('measurements', function() {
+    return this.get('measurements.length') > 0;
   }),
 
   actions: {
     addCharacteristic: function() {
-      const newChar = this.attrs['add-characteristic']();
-      this.get('strain.measurements').addObject(newChar);
+      const measurement = this.attrs['add-characteristic']();
+      this.get('measurements').addObject(measurement);
     },
 
     changeSortParam: function(col) {
diff --git a/app/pods/protected/strains/show/strain-card/template.hbs b/app/pods/protected/strains/show/strain-card/template.hbs
index 517256d..968e89d 100644
--- a/app/pods/protected/strains/show/strain-card/template.hbs
+++ b/app/pods/protected/strains/show/strain-card/template.hbs
@@ -75,7 +75,7 @@
         <dd>
           {{
             protected/strains/measurements-table
-            strain=strain
+            measurements=strain.measurements
             canEdit=false
             canAdd=false
           }}
diff --git a/app/pods/protected/strains/strain-form/component.js b/app/pods/protected/strains/strain-form/component.js
index 4b1518c..006a62b 100644
--- a/app/pods/protected/strains/strain-form/component.js
+++ b/app/pods/protected/strains/strain-form/component.js
@@ -10,6 +10,7 @@ export default Component.extend(SetupMetaData, {
   isDirty: false,
   speciesList: null,
   allCharacteristics: null,
+  updateQueue: [],
   deleteQueue: [],
 
   // Actions
@@ -17,7 +18,6 @@ export default Component.extend(SetupMetaData, {
   "on-cancel": null,
   "on-update": null,
   "add-characteristic": null,
-  "save-measurement": null,
 
   // CPs
   sortParams: ['sortOrder'],
@@ -36,13 +36,38 @@ export default Component.extend(SetupMetaData, {
   measurements: [],
 
   resetOnInit: Ember.on('init', function() {
+    this._resetProperties();
+  }),
+
+  _resetProperties: function() {
+    // Still some coupling going on here because of adding strain to measurement
+    this.get('measurements').forEach((val) => {
+      if (val.get('hasDirtyAttributes')) {
+        val.rollbackAttributes();
+      }
+      if (val.get('isNew')) {
+        this.get('strain.measurements').removeObject(val);
+      }
+    });
     this.get('propertiesList').forEach((field) => {
       const valueInStrain = this.get('strain').get(field);
-      this.set(field, valueInStrain);
+      if (field === 'measurements') {
+        let tempArray = [];
+        valueInStrain.forEach((val) => {
+          if (!val.get('isNew')) {
+            tempArray.push(val);
+          }
+        });
+        this.set(field, tempArray);
+      } else {
+        this.set(field, valueInStrain);
+      }
     });
+    this.set('updateQueue', []);
+    this.set('deleteQueue', []);
     // Read-only attributes
     this.set('isNew', this.get('strain.isNew'));
-  }),
+  },
 
   updateField: function(property, value) {
     this.set(property, value);
@@ -56,10 +81,11 @@ export default Component.extend(SetupMetaData, {
 
   actions: {
     save: function() {
-      return this.attrs['on-save'](this.getProperties(this.get('propertiesList')), this.get('deleteQueue'));
+      return this.attrs['on-save'](this.getProperties(this.get('propertiesList')), this.get('deleteQueue'), this.get('updateQueue'));
     },
 
     cancel: function() {
+      this._resetProperties();
       return this.attrs['on-cancel']();
     },
 
@@ -68,7 +94,12 @@ export default Component.extend(SetupMetaData, {
     },
 
     saveMeasurement: function(measurement, properties) {
-      return this.attrs['save-measurement'](measurement, properties);
+      measurement.setProperties(properties);
+      measurement.set('strain', this.get('strain'));
+      if (!measurement.get('isNew')) {
+        this.get('updateQueue').pushObject(measurement);
+      }
+      this.set('isDirty', true);
     },
 
     deleteMeasurement: function(value) {
@@ -77,9 +108,7 @@ export default Component.extend(SetupMetaData, {
         this.get('deleteQueue').pushObject(characteristic);
       }
       this.get('deleteQueue').pushObject(value);
-
-      let measurements = this.get('measurements');
-      measurements.removeObject(value);
+      this.get('measurements').removeObject(value);
       this.set('isDirty', true);
     },
 
diff --git a/app/pods/protected/strains/strain-form/template.hbs b/app/pods/protected/strains/strain-form/template.hbs
index e44096f..d1b1fb8 100644
--- a/app/pods/protected/strains/strain-form/template.hbs
+++ b/app/pods/protected/strains/strain-form/template.hbs
@@ -61,7 +61,7 @@
     <div>
       {{
         protected/strains/measurements-table
-        strain=strain
+        measurements=measurements
         add-characteristic=(action "addCharacteristic")
         allCharacteristics=allCharacteristics
         save-measurement=(action "saveMeasurement")