diff --git a/.watchmanconfig b/.watchmanconfig
index 5e9462c..e7834e3 100644
--- a/.watchmanconfig
+++ b/.watchmanconfig
@@ -1,3 +1,3 @@
 {
-  "ignore_dirs": ["tmp"]
+  "ignore_dirs": ["tmp", "dist"]
 }
diff --git a/README.md b/README.md
index b56745d..4e4e4bb 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,6 @@
 # clostridiumdotinfo
 
-Detailed information to come --- for now see the ember-cli boilerplate below.
-
-This README outlines the details of collaborating on this Ember application.
-A short introduction of this app could easily go here.
+This ember application is an interface for the [bactdb](https://github.com/thermokarst/bactdb).
 
 ## Prerequisites
 
@@ -17,13 +14,14 @@ You will need the following things properly installed on your computer.
 
 ## Installation
 
-* `git clone <repository-url>` this repository
+* `git clone https://github.com/thermokarst/hymenobacterdotinfo` this repository
 * change into the new directory
 * `npm install`
 * `bower install`
 
 ## Running / Development
 
+* Launch `bactdb`
 * `ember server`
 * Visit your app at [http://localhost:4200](http://localhost:4200).
 
@@ -43,7 +41,8 @@ Make use of the many generators for code, try `ember help generate` for more det
 
 ### Deploying
 
-Specify what it takes to deploy your app.
+* `ember build -e staging`
+* `firebase deploy`
 
 ## Further Reading / Useful Links
 
diff --git a/app/app.js b/app/app.js
index 8d66b95..8b234d6 100644
--- a/app/app.js
+++ b/app/app.js
@@ -3,14 +3,14 @@ import Resolver from 'ember/resolver';
 import loadInitializers from 'ember/load-initializers';
 import config from './config/environment';
 
-var App;
+let App;
 
 Ember.MODEL_FACTORY_INJECTIONS = true;
 
 App = Ember.Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
-  Resolver: Resolver
+  Resolver
 });
 
 loadInitializers(App, config.modulePrefix);
diff --git a/app/helpers/equal.js b/app/helpers/equal.js
index db3e867..a003400 100644
--- a/app/helpers/equal.js
+++ b/app/helpers/equal.js
@@ -1,7 +1,9 @@
 import Ember from 'ember';
 
+const { Helper: { helper } } = Ember;
+
 export function equalHelper(params) {
   return params[0] === params[1];
 }
 
-export default Ember.HTMLBars.makeBoundHelper(equalHelper);
+export default helper(equalHelper);
diff --git a/app/initializers/component-store.js b/app/initializers/component-store.js
deleted file mode 100644
index 54a3064..0000000
--- a/app/initializers/component-store.js
+++ /dev/null
@@ -1,8 +0,0 @@
-export function initialize(container, application) {
-  application.inject('component', 'store', 'service:store');
-}
-
-export default {
-  name: 'component-store',
-  initialize: initialize
-};
diff --git a/app/mirage/config.js b/app/mirage/config.js
index 4d9afb3..9f1422e 100644
--- a/app/mirage/config.js
+++ b/app/mirage/config.js
@@ -2,7 +2,7 @@ export default function() {
   // Don't use mirage for development (for now)
   this.urlPrefix = 'http://127.0.0.1:8901';
   this.namespace = '/api';
-  this.passthrough();
+  this.passthrough('http://localhost:4200/**', 'http://127.0.0.1:8901/**');
 }
 
 export function testConfig() {
@@ -10,7 +10,10 @@ export function testConfig() {
   this.namespace = '/api/clostridium';
   this.timing = 0;
 
+  this.get('/users');
+  this.post('/users');
   this.get('/users/:id');
+  this.put('/users/:id');
 
   this.get('/species');
   this.post('/species');
@@ -21,4 +24,19 @@ export function testConfig() {
   this.post('/characteristics');
   this.get('/characteristics/:id');
   this.put('/characteristics/:id');
+
+  this.get('/strains', function(db /*, request*/) {
+    return {
+      strains: db.strains,
+      species: db.species,
+    };
+  });
+  this.post('/strains');
+  this.get('/strains/:id', function(db, request) {
+    return {
+      strain: db.strains.find(request.params.id),
+      species: db.species, // Just send back everything we've got
+    };
+  });
+  this.put('/strains/:id');
 }
diff --git a/app/mirage/factories/strains.js b/app/mirage/factories/strains.js
new file mode 100644
index 0000000..6165528
--- /dev/null
+++ b/app/mirage/factories/strains.js
@@ -0,0 +1,17 @@
+import Mirage, { faker } from 'ember-cli-mirage';
+
+export default Mirage.Factory.extend({
+  measurements: [],
+  characteristics: [],
+  species: 0,
+  strainName() { return faker.lorem.words().join(' '); },
+  typeStrain: faker.random.boolean(),
+  accessionNumbers() { return faker.lorem.words().join(' '); },
+  genbank() { return faker.lorem.words().join(' '); },
+  wholeGenomeSequence() { return faker.lorem.words().join(' '); },
+  isolatedFrom: faker.lorem.sentences(),
+  notes: faker.lorem.sentences(),
+  totalMeasurements: 0,
+  sortOrder: faker.random.number(),
+  canEdit: faker.random.boolean(),
+});
diff --git a/app/mixins/save-model.js b/app/mixins/save-model.js
index 53efda9..d4459e3 100644
--- a/app/mixins/save-model.js
+++ b/app/mixins/save-model.js
@@ -13,16 +13,12 @@ export default Mixin.create({
       const fallbackRoute = this.get('fallbackRouteSave');
 
       model.setProperties(properties);
-
-      if (model.get('hasDirtyAttributes')) {
-        model.save().then((model) => {
-          this.transitionToRoute(fallbackRoute, model);
-        }, () => {
-          ajaxError(model.get('errors'), this.get('flashMessages'));
-        });
-      } else {
+      model.save().then((model) => {
+        this.get('flashMessages').clearMessages();
         this.transitionToRoute(fallbackRoute, model);
-      }
+      }, () => {
+        ajaxError(model.get('errors'), this.get('flashMessages'));
+      });
     },
 
     cancel: function() {
diff --git a/app/mixins/setup-metadata.js b/app/mixins/setup-metadata.js
index 183f93f..bdfd886 100644
--- a/app/mixins/setup-metadata.js
+++ b/app/mixins/setup-metadata.js
@@ -5,10 +5,12 @@ const { Mixin, inject: { service }} = Ember;
 export default Mixin.create({
   currentUser: service('session-account'),
   metaData: null,
+  isAdmin: null,
 
   setupMetaDataOnInit: Ember.on('init', function() {
     this.get('currentUser.account').then((user) => {
       this.set('metaData', user.get('metaData'));
+      this.set('isAdmin', user.get('isAdmin'));
     });
   }),
 });
diff --git a/app/models/characteristic.js b/app/models/characteristic.js
index 766fdbf..ea6a6d5 100644
--- a/app/models/characteristic.js
+++ b/app/models/characteristic.js
@@ -1,14 +1,16 @@
 import DS from 'ember-data';
 
-export default DS.Model.extend({
-  characteristicName    : DS.attr('string'),
-  characteristicTypeName: DS.attr('string'),
-  strains               : DS.hasMany('strain', { async: false }),
-  measurements          : DS.hasMany('measurements', { async: false }),
-  createdAt             : DS.attr('date'),
-  updatedAt             : DS.attr('date'),
-  createdBy             : DS.attr('number'),
-  updatedBy             : DS.attr('number'),
-  sortOrder             : DS.attr('number'),
-  canEdit               : DS.attr('boolean'),
+const { Model, attr, hasMany } = DS;
+
+export default Model.extend({
+  characteristicName    : attr('string'),
+  characteristicTypeName: attr('string'),
+  strains               : hasMany('strain', { async: false }),
+  measurements          : hasMany('measurements', { async: false }),
+  createdAt             : attr('date'),
+  updatedAt             : attr('date'),
+  createdBy             : attr('number'),
+  updatedBy             : attr('number'),
+  sortOrder             : attr('number'),
+  canEdit               : attr('boolean'),
 });
diff --git a/app/models/measurement.js b/app/models/measurement.js
index 41a7644..009aa8b 100644
--- a/app/models/measurement.js
+++ b/app/models/measurement.js
@@ -1,15 +1,17 @@
 import DS from 'ember-data';
 
-export default DS.Model.extend({
-  strain             : DS.belongsTo('strain', { async: false }),
-  characteristic     : DS.belongsTo('characteristic', { async: false }),
-  value              : DS.attr('string'),
-  confidenceInterval : DS.attr('number'),
-  unitType           : DS.attr('string'),
-  notes              : DS.attr('string'),
-  testMethod         : DS.attr('string'),
-  createdAt          : DS.attr('date'),
-  updatedAt          : DS.attr('date'),
-  createdBy          : DS.attr('number'),
-  updatedBy          : DS.attr('number'),
+const { Model, belongsTo, attr } = DS;
+
+export default Model.extend({
+  strain             : belongsTo('strain', { async: false }),
+  characteristic     : belongsTo('characteristic', { async: false }),
+  value              : attr('string'),
+  confidenceInterval : attr('number'),
+  unitType           : attr('string'),
+  notes              : attr('string'),
+  testMethod         : attr('string'),
+  createdAt          : attr('date'),
+  updatedAt          : attr('date'),
+  createdBy          : attr('number'),
+  updatedBy          : attr('number'),
 });
diff --git a/app/models/species.js b/app/models/species.js
index bb27451..7581d10 100644
--- a/app/models/species.js
+++ b/app/models/species.js
@@ -2,20 +2,23 @@ import DS from 'ember-data';
 import config from '../config/environment';
 import Ember from 'ember';
 
-export default DS.Model.extend({
-  speciesName : DS.attr('string'),
-  typeSpecies : DS.attr('boolean'),
-  etymology   : DS.attr('string'),
-  genusName   : DS.attr('string', { defaultValue: config.APP.genus }),
-  strains     : DS.hasMany('strain', { async: false }),
-  totalStrains: DS.attr('number'),
-  createdAt   : DS.attr('date'),
-  updatedAt   : DS.attr('date'),
-  createdBy   : DS.attr('number'),
-  updatedBy   : DS.attr('number'),
-  sortOrder   : DS.attr('number'),
-  canEdit     : DS.attr('boolean'),
+const { Model, attr, hasMany } = DS;
 
+export default Model.extend({
+  speciesName : attr('string'),
+  typeSpecies : attr('boolean'),
+  etymology   : attr('string'),
+  genusName   : attr('string', { defaultValue: config.APP.genus }),
+  strains     : hasMany('strain', { async: false }),
+  totalStrains: attr('number'),
+  createdAt   : attr('date'),
+  updatedAt   : attr('date'),
+  createdBy   : attr('number'),
+  updatedBy   : attr('number'),
+  sortOrder   : attr('number'),
+  canEdit     : attr('boolean'),
+
+  // TODO: move this to component/helper
   speciesNameMU: function() {
     return Ember.String.htmlSafe(`<em>${this.get('speciesName')}</em>`);
   }.property('speciesName').readOnly(),
diff --git a/app/models/strain.js b/app/models/strain.js
index 72d4ff6..b202a78 100644
--- a/app/models/strain.js
+++ b/app/models/strain.js
@@ -1,30 +1,39 @@
 import DS from 'ember-data';
 import Ember from 'ember';
 
-export default DS.Model.extend({
-  measurements       : DS.hasMany('measurements', { async: false }),
-  characteristics    : DS.hasMany('characteristics', { async: false }),
-  species            : DS.belongsTo('species', { async: false }),
-  strainName         : DS.attr('string'),
-  typeStrain         : DS.attr('boolean'),
-  accessionNumbers   : DS.attr('string'),
-  genbank            : DS.attr('string'),
-  wholeGenomeSequence: DS.attr('string'),
-  isolatedFrom       : DS.attr('string'),
-  notes              : DS.attr('string'),
-  createdAt          : DS.attr('date'),
-  updatedAt          : DS.attr('date'),
-  createdBy          : DS.attr('number'),
-  updatedBy          : DS.attr('number'),
-  totalMeasurements  : DS.attr('number'),
-  sortOrder          : DS.attr('number'),
-  canEdit            : DS.attr('boolean'),
+const { Model, hasMany, belongsTo, attr } = DS;
 
+export default Model.extend({
+  measurements       : hasMany('measurements', { async: false }),
+  characteristics    : hasMany('characteristics', { async: false }),
+  species            : belongsTo('species', { async: false }),
+  strainName         : attr('string'),
+  typeStrain         : attr('boolean'),
+  accessionNumbers   : attr('string'),
+  genbank            : attr('string'),
+  wholeGenomeSequence: attr('string'),
+  isolatedFrom       : attr('string'),
+  notes              : attr('string'),
+  createdAt          : attr('date'),
+  updatedAt          : attr('date'),
+  createdBy          : attr('number'),
+  updatedBy          : attr('number'),
+  totalMeasurements  : attr('number'),
+  sortOrder          : attr('number'),
+  canEdit            : attr('boolean'),
+
+  // TODO: move this to component/helper
   strainNameMU: function() {
     let type = this.get('typeStrain') ? '<sup>T</sup>' : '';
     return Ember.String.htmlSafe(`${this.get('strainName')}${type}`);
   }.property('strainName', 'typeStrain').readOnly(),
 
+  // TODO: move this to component/helper
+  fullName: Ember.computed('species', 'strainName', function() {
+    return `${this.get('species.speciesName')} ${this.get('strainNameMU')}`;
+  }),
+
+  // TODO: move this to component/helper
   fullNameMU: function() {
     return Ember.String.htmlSafe(`<em>${this.get('species.speciesName')}</em> ${this.get('strainNameMU')}`);
   }.property('species', 'strainNameMU').readOnly(),
diff --git a/app/models/user.js b/app/models/user.js
index 198f451..89b7c0f 100644
--- a/app/models/user.js
+++ b/app/models/user.js
@@ -1,29 +1,32 @@
 import Ember from 'ember';
 import DS from 'ember-data';
 
-export default DS.Model.extend({
-  email    : DS.attr('string'),
-  password : DS.attr('string'),
-  name     : DS.attr('string'),
-  role     : DS.attr('string'),
-  canEdit  : DS.attr('boolean'),
-  createdAt: DS.attr('date'),
-  updatedAt: DS.attr('date'),
+const { Model, attr } = DS;
+const { computed } = Ember;
 
-  isAdmin: function() {
+export default Model.extend({
+  email    : attr('string'),
+  password : attr('string'),
+  name     : attr('string'),
+  role     : attr('string'),
+  canEdit  : attr('boolean'),
+  createdAt: attr('date'),
+  updatedAt: attr('date'),
+
+  isAdmin: computed('role', function() {
     return this.get('role') === 'A';
-  }.property('role'),
+  }),
 
-  isWriter: function() {
+  isWriter: computed('role', function() {
     return this.get('role') === 'W';
-  }.property('role'),
+  }),
 
-  isReader: function() {
+  isReader: computed('role', function() {
     return this.get('role') === 'R';
-  }.property('role'),
+  }),
 
-  fullRole: function() {
-    let role = this.get('role');
+  fullRole: computed('role', function() {
+    const role = this.get('role');
     if (role === 'R') {
       return 'Read-Only';
     } else if (role === 'W') {
@@ -33,13 +36,13 @@ export default DS.Model.extend({
     } else {
       return 'Error';
     }
-  }.property('role'),
+  }),
 
-  canWrite: Ember.computed('role', function() {
+  canWrite: computed('role', function() {
     return this.get('role') !== 'R';
   }),
 
-  metaData: Ember.computed('canWrite', function() {
+  metaData: computed('canWrite', function() {
     return { 'canAdd': this.get('canWrite') };
   }),
 
diff --git a/app/pods/application/adapter.js b/app/pods/application/adapter.js
index 96daa1a..0d7ed91 100644
--- a/app/pods/application/adapter.js
+++ b/app/pods/application/adapter.js
@@ -1,7 +1,9 @@
 import DS from 'ember-data';
 import DataAdapterMixin from 'ember-simple-auth/mixins/data-adapter-mixin';
 
-export default DS.RESTAdapter.extend(DataAdapterMixin, {
+const { RESTAdapter } = DS;
+
+export default RESTAdapter.extend(DataAdapterMixin, {
   authorizer: 'authorizer:application',
 
   namespace: function() {
diff --git a/app/pods/application/route.js b/app/pods/application/route.js
index ca03050..e677da9 100644
--- a/app/pods/application/route.js
+++ b/app/pods/application/route.js
@@ -1,7 +1,9 @@
 import Ember from 'ember';
 import ApplicationRouteMixin from 'ember-simple-auth/mixins/application-route-mixin';
 
-export default Ember.Route.extend(ApplicationRouteMixin, {
+const { Route } = Ember;
+
+export default Route.extend(ApplicationRouteMixin, {
   actions: {
     invalidateSession: function() {
       this.get('session').invalidate().then(() => {
@@ -9,7 +11,5 @@ export default Ember.Route.extend(ApplicationRouteMixin, {
         return true;
       });
     },
-
   },
-
 });
diff --git a/app/pods/components/text-editor/component.js b/app/pods/components/text-editor/component.js
index 01d00fd..5fca82d 100644
--- a/app/pods/components/text-editor/component.js
+++ b/app/pods/components/text-editor/component.js
@@ -1,13 +1,25 @@
 import Ember from 'ember';
 /* global Quill */
 
-export default Ember.Component.extend({
-  quill: null,
+const { Component } = Ember;
+
+export default Component.extend({
+  // Passed in
   value: null,
-  update: null,
+
+  // Internal
+  quill: null,
+
+  didReceiveAttrs() {
+    this._super(...arguments);
+
+    if (!this.attrs.update) {
+      throw new Error(`You must provide an \`update\` action.`);
+    }
+  },
 
   didInsertElement: function() {
-    let quill = new Quill(`#${this.get('elementId')} .editor`, {
+    const quill = new Quill(`#${this.get('elementId')} .editor`, {
       formats: ['bold', 'italic', 'underline'],
       modules: {
         'toolbar': { container: `#${this.get('elementId')} .toolbar` }
diff --git a/app/pods/login/controller.js b/app/pods/login/controller.js
index ec1077b..910a88a 100644
--- a/app/pods/login/controller.js
+++ b/app/pods/login/controller.js
@@ -1,14 +1,15 @@
 import Ember from 'ember';
 
-export default Ember.Controller.extend({
-  session: Ember.inject.service('session'),
+const { Controller, inject: { service } } = Ember;
+
+export default Controller.extend({
+  session: service(),
 
   actions: {
-    authenticate: function() {
+    authenticate: function(identification, password) {
       // Manually clean up because there might not be a transition
       this.get('flashMessages').clearMessages();
 
-      let { identification, password } = this.getProperties('identification', 'password');
       this.transitionToRoute('loading').then(() => {
         this.get('session').authenticate('authenticator:oauth2', identification, password).catch((error) => {
           this.transitionToRoute('login').then(() => {
diff --git a/app/pods/login/login-form/component.js b/app/pods/login/login-form/component.js
new file mode 100644
index 0000000..638cba4
--- /dev/null
+++ b/app/pods/login/login-form/component.js
@@ -0,0 +1,27 @@
+import Ember from 'ember';
+
+const { Component } = Ember;
+
+export default Component.extend({
+  // Actions
+  "on-submit": null,
+
+  // Property mapping
+  propertiesList: ['identification', 'password'],
+  identification: null,
+  password: null,
+
+  actions: {
+    submit: function() {
+      return this.attrs['on-submit'](this.get('identification'), this.get('password'));
+    },
+
+    identificationDidChange: function(value) {
+      this.set('identification', value);
+    },
+
+    passwordDidChange: function(value) {
+      this.set('password', value);
+    },
+  },
+});
diff --git a/app/pods/login/login-form/template.hbs b/app/pods/login/login-form/template.hbs
new file mode 100644
index 0000000..45afb9b
--- /dev/null
+++ b/app/pods/login/login-form/template.hbs
@@ -0,0 +1,12 @@
+<form {{action "submit" on="submit"}}>
+  <h2>Log In</h2>
+    {{one-way-input type="text" class="identification" value=identification update=(action "identificationDidChange") placeholder="Email"}}
+    {{one-way-input type="password" class="password" value=password update=(action "passwordDidChange") placeholder="Password"}}
+    <button type="submit" class="button-gray log-in">
+      Log In
+    </button>
+</form>
+<br>
+<div>
+  {{link-to 'Forget your password?' 'users.requestlockouthelp'}}
+</div>
diff --git a/app/pods/login/route.js b/app/pods/login/route.js
index c38d19e..a9687fd 100644
--- a/app/pods/login/route.js
+++ b/app/pods/login/route.js
@@ -1,4 +1,6 @@
 import Ember from 'ember';
 import UnauthenticatedRouteMixin from 'ember-simple-auth/mixins/unauthenticated-route-mixin';
 
-export default Ember.Route.extend(UnauthenticatedRouteMixin, {});
+const { Route } = Ember;
+
+export default Route.extend(UnauthenticatedRouteMixin, {});
diff --git a/app/pods/login/template.hbs b/app/pods/login/template.hbs
index 246c876..870b977 100644
--- a/app/pods/login/template.hbs
+++ b/app/pods/login/template.hbs
@@ -1,12 +1,6 @@
 {{#x-application invalidateSession="invalidateSession"}}
-  <form {{action "authenticate" on="submit"}}>
-    <h2>Log In</h2>
-      {{input value=identification type="text" placeholder="Email"}}
-      {{input value=password type="password" placeholder="Password"}}
-      {{input class="button-gray" type="submit" value="Log In"}}
-  </form>
-  <br>
-  <div>
-    {{link-to 'Forget your password?' 'users.requestlockouthelp'}}
-  </div>
+  {{
+    login/login-form
+    on-submit=(action "authenticate")
+  }}
 {{/x-application}}
diff --git a/app/pods/not-found/route.js b/app/pods/not-found/route.js
index 5be93bf..c14f72d 100644
--- a/app/pods/not-found/route.js
+++ b/app/pods/not-found/route.js
@@ -1,8 +1,10 @@
 import Ember from 'ember';
 
-export default Ember.Route.extend({
+const { Route } = Ember;
+
+export default Route.extend({
   redirect: function() {
-    let url = this.router.location.formatURL('/not-found');
+    const url = this.router.location.formatURL('/not-found');
 
     if (window.location.pathname !== url) {
       this.transitionTo('/not-found');
diff --git a/app/pods/protected/about/route.js b/app/pods/protected/about/route.js
index 096e3c5..5f46de6 100644
--- a/app/pods/protected/about/route.js
+++ b/app/pods/protected/about/route.js
@@ -1,3 +1,5 @@
 import Ember from 'ember';
 
-export default Ember.Route.extend({});
+const { Route } = Ember;
+
+export default Route.extend({});
diff --git a/app/pods/protected/characteristics/edit/controller.js b/app/pods/protected/characteristics/edit/controller.js
index 0b83924..aff45e1 100644
--- a/app/pods/protected/characteristics/edit/controller.js
+++ b/app/pods/protected/characteristics/edit/controller.js
@@ -6,5 +6,5 @@ const { Controller } = Ember;
 export default Controller.extend(SaveModel, {
   // Required for SaveModel mixin
   fallbackRouteSave: 'protected.characteristics.show',
-  fallbackRouteCancel: 'protected.characteristics.index',
+  fallbackRouteCancel: 'protected.characteristics.show',
 });
diff --git a/app/pods/protected/compare/controller.js b/app/pods/protected/compare/controller.js
index 00ef991..0ba05a4 100644
--- a/app/pods/protected/compare/controller.js
+++ b/app/pods/protected/compare/controller.js
@@ -1,41 +1,22 @@
 import Ember from 'ember';
 
-export default Ember.Controller.extend({
+const { Controller } = Ember;
+
+export default Controller.extend({
+  selectedStrains: null,
+  selectedCharacteristics: null,
+
   actions: {
-    search: function() {
-      let query = {
-        strain_ids: this.get('selectedStrains'),
-        characteristic_ids: this.get('selectedCharacteristics'),
-      };
-
-      this.transitionToRoute('protected.compare.results', {queryParams: query});
+    search: function(query) {
+      this.transitionToRoute('protected.compare.results', { queryParams: query });
     },
 
-    selectAllStrains: function() {
-      let strains = this.get('strains');
-      let strain_ids = [];
-      strains.forEach((strain) => {
-        strain_ids.push(strain.id);
-      });
-      this.set('selectedStrains', strain_ids.join(","));
+    updateStrainSelection: function(selection) {
+      this.set('selectedStrains', selection);
     },
 
-    deselectAllStrains: function() {
-      this.set('selectedStrains', '');
+    updateCharacteristicSelection: function(selection) {
+      this.set('selectedCharacteristics', selection);
     },
-
-    selectAllCharacteristics: function() {
-      let chars = this.get('characteristics');
-      let char_ids = [];
-      chars.forEach((char) => {
-        char_ids.push(char.id);
-      });
-      this.set('selectedCharacteristics', char_ids.join(","));
-    },
-
-    deselectAllCharacteristics: function() {
-      this.set('selectedCharacteristics', '');
-    },
-
   }
 });
diff --git a/app/pods/protected/compare/results/controller.js b/app/pods/protected/compare/results/controller.js
index 391985a..c054c46 100644
--- a/app/pods/protected/compare/results/controller.js
+++ b/app/pods/protected/compare/results/controller.js
@@ -1,31 +1,8 @@
 import Ember from 'ember';
 
-export default Ember.Controller.extend({
+const { Controller } = Ember;
+
+export default Controller.extend({
   queryParams: ['strain_ids', 'characteristic_ids'],
 
-  csvLink: function() {
-    let token = encodeURIComponent(this.get('session.secure.token'));
-    return `${this.get('globals.apiURL')}/api/${this.get('globals.genus')}/` +
-      `compare?token=${token}&strain_ids=${this.get('strain_ids')}&` +
-      `characteristic_ids=${this.get('characteristic_ids')}&mimeType=csv`;
-  }.property('strain_ids', 'characteristic_ids').readOnly(),
-
-  strains: function() {
-    let strains = [];
-    let strain_ids = this.get('strain_ids').split(',');
-    strain_ids.forEach((id) => {
-      strains.push(this.store.peekRecord('strain', id));
-    });
-    return strains;
-  }.property('strain_ids'),
-
-  characteristics: function() {
-    let characteristics = [];
-    let characteristic_ids = this.get('characteristic_ids').split(',');
-    characteristic_ids.forEach((id) => {
-      characteristics.push(this.store.peekRecord('characteristic', id));
-    });
-    return characteristics;
-  }.property('characteristic_ids'),
-
 });
diff --git a/app/pods/protected/compare/results/results-table/component.js b/app/pods/protected/compare/results/results-table/component.js
new file mode 100644
index 0000000..87b2369
--- /dev/null
+++ b/app/pods/protected/compare/results/results-table/component.js
@@ -0,0 +1,19 @@
+import Ember from 'ember';
+
+const { Component, computed, inject: { service } } = Ember;
+
+export default Component.extend({
+  session: service(),
+
+  strains: null,
+  characteristics: null,
+  strain_ids: null,
+  characteristic_ids: null,
+
+  csvLink: computed('strain_ids', 'characteristic_ids', function() {
+    const token = encodeURIComponent(this.get('session.data.authenticated.access_token'));
+    return `${this.get('globals.apiURL')}/api/${this.get('globals.genus')}/` +
+      `compare?token=${token}&strain_ids=${this.get('strain_ids')}&` +
+      `characteristic_ids=${this.get('characteristic_ids')}&mimeType=csv`;
+  }),
+});
diff --git a/app/pods/protected/compare/results/results-table/template.hbs b/app/pods/protected/compare/results/results-table/template.hbs
new file mode 100644
index 0000000..c90d3bc
--- /dev/null
+++ b/app/pods/protected/compare/results/results-table/template.hbs
@@ -0,0 +1,25 @@
+<table class="flakes-table">
+  <thead>
+    <tr>
+      <th>Characteristic</th>
+      {{#each strains as |strain|}}
+        <th>
+          {{#link-to 'protected.strains.show' strain.id classBinding="data.typeStrain:type-strain"}}
+            {{strain.fullNameMU}}
+          {{/link-to}}
+        </th>
+      {{/each}}
+    </tr>
+  </thead>
+  <tbody>
+    {{#each characteristics as |row|}}
+      <tr>
+        {{#each row key="@index" as |col|}}
+          <td>{{col}}</td>
+        {{/each}}
+      </tr>
+    {{/each}}
+  </tbody>
+</table>
+<hr>
+<a href="{{csvLink}}" download>Download as CSV</a>
diff --git a/app/pods/protected/compare/results/route.js b/app/pods/protected/compare/results/route.js
index 981fa36..4ae7fd0 100644
--- a/app/pods/protected/compare/results/route.js
+++ b/app/pods/protected/compare/results/route.js
@@ -1,8 +1,10 @@
 import Ember from 'ember';
-import ajaxRequest from '../../../../utils/ajax-request';
 
-export default Ember.Route.extend({
-  session: Ember.inject.service('session'),
+const { Route, $: { isEmptyObject }, inject: { service } } = Ember;
+
+export default Route.extend({
+  session: service(),
+  ajax: service(),
 
   queryParams: {
     strain_ids: {
@@ -15,8 +17,9 @@ export default Ember.Route.extend({
 
   beforeModel: function(transition) {
     this._super(transition);
-    if (Ember.$.isEmptyObject(transition.queryParams.strain_ids) ||
-        Ember.$.isEmptyObject(transition.queryParams.characteristic_ids)) {
+    const strain_ids = transition.queryParams.strain_ids;
+    const characteristic_ids = transition.queryParams.characteristic_ids;
+    if (isEmptyObject(strain_ids) || isEmptyObject(characteristic_ids)) {
       this.transitionTo('protected.compare');
     }
   },
@@ -26,23 +29,35 @@ export default Ember.Route.extend({
       this.transitionTo('protected.compare');
     }
 
-    let compare = this.controllerFor('protected.compare');
+    const compare = this.controllerFor('protected.compare');
     compare.set('selectedStrains', params.strain_ids);
     compare.set('selectedCharacteristics', params.characteristic_ids);
 
-    let url = `${this.get('globals.apiURL')}/api/${this.get('globals.genus')}/compare`;
-    let options = {
-      method: 'GET',
-      data: params,
-    };
-    return ajaxRequest(url, options, this.get('session'));
+    return this.get('ajax').request('/compare', { data: params });
   },
 
   setupController: function(controller, model) {
     model.forEach((m, i) => {
-      let c = this.store.peekRecord('characteristic', m[0]);
+      const c = this.store.peekRecord('characteristic', m[0]);
       model[i][0] = c.get('characteristicName');
     });
+
+    const compare = this.controllerFor('protected.compare');
+
+    const strains = [];
+    const strain_ids = compare.get('selectedStrains').split(',');
+    strain_ids.forEach((id) => {
+      strains.push(this.store.peekRecord('strain', id));
+    });
+    controller.set('strains', strains);
+
+    const characteristics = [];
+    const characteristic_ids = compare.get('selectedCharacteristics').split(',');
+    characteristic_ids.forEach((id) => {
+      characteristics.push(this.store.peekRecord('characteristic', id));
+    });
+    controller.set('characteristics', characteristics);
+
     controller.set('model', model);
   },
 
diff --git a/app/pods/protected/compare/results/template.hbs b/app/pods/protected/compare/results/template.hbs
index f40869c..18542e7 100644
--- a/app/pods/protected/compare/results/template.hbs
+++ b/app/pods/protected/compare/results/template.hbs
@@ -1,25 +1,7 @@
-<table class="flakes-table">
-  <thead>
-    <tr>
-      <th>Characteristic</th>
-      {{#each strains as |strain|}}
-        <th>
-          {{#link-to 'protected.strains.show' strain.id classBinding="data.typeStrain:type-strain"}}
-            {{strain.fullNameMU}}
-          {{/link-to}}
-        </th>
-      {{/each}}
-    </tr>
-  </thead>
-  <tbody>
-    {{#each model as |row|}}
-      <tr>
-        {{#each row key="@index" as |col|}}
-          <td>{{col}}</td>
-        {{/each}}
-      </tr>
-    {{/each}}
-  </tbody>
-</table>
-<hr>
-<a href="{{csvLink}}" download>Download as CSV</a>
+{{
+  protected/compare/results/results-table
+  strains=strains
+  characteristics=model
+  strain_ids=strain_ids
+  characteristic_ids=characteristic_ids
+}}
diff --git a/app/pods/protected/compare/route.js b/app/pods/protected/compare/route.js
index 19c8e94..199ade7 100644
--- a/app/pods/protected/compare/route.js
+++ b/app/pods/protected/compare/route.js
@@ -1,6 +1,8 @@
 import Ember from 'ember';
 
-export default Ember.Route.extend({
+const { Route } = Ember;
+
+export default Route.extend({
   model: function() {
     return this.store.findAll('characteristic');
   },
diff --git a/app/pods/protected/compare/select-form/component.js b/app/pods/protected/compare/select-form/component.js
new file mode 100644
index 0000000..db58626
--- /dev/null
+++ b/app/pods/protected/compare/select-form/component.js
@@ -0,0 +1,61 @@
+import Ember from 'ember';
+
+const { Component } = Ember;
+
+export default Component.extend({
+  characteristics: null,
+  strains: null,
+
+  "on-search": null,
+  "update-strains": null,
+  "update-characteristics": null,
+
+  selectedStrains: null,
+  selectedCharacteristics: null,
+
+  updateStrains: function(selection) {
+    this.set('selectedStrains', selection);
+    this.attrs['update-strains'](this.get('selectedStrains'));
+  },
+
+  updateCharacteristics: function(selection) {
+    this.set('selectedCharacteristics', selection);
+    this.attrs['update-characteristics'](this.get('selectedCharacteristics'));
+  },
+
+  actions: {
+    search: function() {
+      const query = {
+        strain_ids: this.get('selectedStrains'),
+        characteristic_ids: this.get('selectedCharacteristics'),
+      };
+      this.attrs['on-search'](query);
+    },
+
+    selectAllStrains: function() {
+      const strains = this.get('strains');
+      const strain_ids = [];
+      strains.forEach((strain) => {
+        strain_ids.push(strain.get('id'));
+      });
+      this.updateStrains(strain_ids.join(","));
+    },
+
+    deselectAllStrains: function() {
+      this.updateStrains("");
+    },
+
+    selectAllCharacteristics: function() {
+      const chars = this.get('characteristics');
+      const char_ids = [];
+      chars.forEach((char) => {
+        char_ids.push(char.get('id'));
+      });
+      this.updateCharacteristics(char_ids.join(","));
+    },
+
+    deselectAllCharacteristics: function() {
+      this.updateCharacteristics("");
+    },
+  },
+});
diff --git a/app/pods/protected/compare/select-form/template.hbs b/app/pods/protected/compare/select-form/template.hbs
new file mode 100644
index 0000000..61a07a5
--- /dev/null
+++ b/app/pods/protected/compare/select-form/template.hbs
@@ -0,0 +1,53 @@
+<div class="span-1">
+  <fieldset>
+    <form {{action 'search' on='submit'}}>
+      <ul>
+        <li>
+          <label>Strains</label>
+          {{
+            select-2
+            multiple=true
+            content=strains
+            value=selectedStrains
+            optionValuePath="id"
+            optionLabelPath="fullNameMU"
+            placeholder="Select one or more strains"
+          }}
+        </li>
+        <li>
+          <button class="action button-green smaller right" {{action 'selectAllStrains'}}>
+            Select All
+          </button>
+          <button class="action button-red smaller right" {{action 'deselectAllStrains'}}>
+            Deselect All
+          </button>
+        </li>
+        <li>
+          <label>Characteristics</label>
+          {{
+            select-2
+            multiple=true
+            content=characteristics
+            value=selectedCharacteristics
+            optionValuePath="id"
+            optionLabelPath="characteristicName"
+            placeholder="Select one or more characteristics"
+          }}
+        </li>
+        <li>
+          <button class="action button-green smaller right" {{action 'selectAllCharacteristics'}}>
+            Select All
+          </button>
+          <button class="action button-red smaller right" {{action 'deselectAllCharacteristics'}}>
+            Deselect All
+          </button>
+        </li>
+        <li>
+          <button type="submit" class="action button-gray smaller right">
+            Search
+          </button>
+        </li>
+      </ul>
+    </form>
+  </fieldset>
+</div>
diff --git a/app/pods/protected/compare/template.hbs b/app/pods/protected/compare/template.hbs
index fefe9a6..af8b15a 100644
--- a/app/pods/protected/compare/template.hbs
+++ b/app/pods/protected/compare/template.hbs
@@ -1,57 +1,14 @@
 <h2>{{genus-name}} - Compare Strains</h2>
 
-<div class="span-1">
-  <fieldset>
-    <form {{action 'search' on='submit'}}>
-      <ul>
-        <li>
-          <label>Strains</label>
-          {{
-            select-2
-            multiple=true
-            content=strains
-            value=selectedStrains
-            optionValuePath="id"
-            optionLabelPath="fullNameMU"
-            placeholder="Select one or more strains"
-          }}
-        </li>
-        <li>
-          <button class="action button-green smaller right" {{action 'selectAllStrains'}}>
-            Select All
-          </button>
-          <button class="action button-red smaller right" {{action 'deselectAllStrains'}}>
-            Deselect All
-          </button>
-        </li>
-        <li>
-          <label>Characteristics</label>
-          {{
-            select-2
-            multiple=true
-            content=characteristics
-            value=selectedCharacteristics
-            optionValuePath="id"
-            optionLabelPath="characteristicName"
-            placeholder="Select one or more characteristics"
-          }}
-        </li>
-        <li>
-          <button class="action button-green smaller right" {{action 'selectAllCharacteristics'}}>
-            Select All
-          </button>
-          <button class="action button-red smaller right" {{action 'deselectAllCharacteristics'}}>
-            Deselect All
-          </button>
-        </li>
-        <li>
-          <button type="submit" class="action button-gray smaller right">
-            Search
-          </button>
-        </li>
-      </ul>
-    </form>
-  </fieldset>
-</div>
+{{
+  protected/compare/select-form
+  characteristics=characteristics
+  strains=strains
+  selectedStrains=selectedStrains
+  selectedCharacteristics=selectedCharacteristics
+  on-search=(action "search")
+  update-strains=(action "updateStrainSelection")
+  update-characteristics=(action "updateCharacteristicSelection")
+}}
 
 {{outlet}}
diff --git a/app/pods/protected/index/route.js b/app/pods/protected/index/route.js
index bfdf329..fdf337b 100644
--- a/app/pods/protected/index/route.js
+++ b/app/pods/protected/index/route.js
@@ -1,6 +1,8 @@
 import Ember from 'ember';
 
-export default Ember.Route.extend({
+const { Route } = Ember;
+
+export default Route.extend({
   beforeModel: function(transition) {
     this._super(transition);
     this.transitionTo('protected.compare');
diff --git a/app/pods/protected/index/template.hbs b/app/pods/protected/index/template.hbs
deleted file mode 100644
index ba4c514..0000000
--- a/app/pods/protected/index/template.hbs
+++ /dev/null
@@ -1 +0,0 @@
-Welcome
diff --git a/app/pods/protected/route.js b/app/pods/protected/route.js
index b1cdc95..64bc25d 100644
--- a/app/pods/protected/route.js
+++ b/app/pods/protected/route.js
@@ -1,9 +1,12 @@
 import Ember from 'ember';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend(AuthenticatedRouteMixin, {
+const { Route } = Ember;
+
+export default Route.extend(AuthenticatedRouteMixin, {
   actions: {
-    error: function() {
+    error: function(err) {
+      console.log(err);
       this.transitionTo('/not-found');
     },
 
diff --git a/app/pods/protected/species/index/species-table/component.js b/app/pods/protected/species/index/species-table/component.js
index d58f509..528c48d 100644
--- a/app/pods/protected/species/index/species-table/component.js
+++ b/app/pods/protected/species/index/species-table/component.js
@@ -1,12 +1,12 @@
 import Ember from 'ember';
 import SetupMetaData from '../../../../../mixins/setup-metadata';
 
-const { Component } = Ember;
+const { Component, computed: { sort } } = Ember;
 
 export default Component.extend(SetupMetaData, {
   species: null,
 
   sortParams: ['speciesName', 'strainCount'],
-  sortedSpecies: Ember.computed.sort('species', 'sortParams'),
+  sortedSpecies: sort('species', 'sortParams'),
 
 });
diff --git a/app/pods/protected/strains/edit/controller.js b/app/pods/protected/strains/edit/controller.js
index 2f84780..4d68665 100644
--- a/app/pods/protected/strains/edit/controller.js
+++ b/app/pods/protected/strains/edit/controller.js
@@ -1,31 +1,36 @@
 import Ember from 'ember';
+import SaveModel from '../../../../mixins/save-model';
 import ajaxError from '../../../../utils/ajax-error';
 
-export default Ember.Controller.extend({
-  actions: {
-    save: function() {
-      let strain = this.get('strain');
+const { Controller } = Ember;
 
-      if (strain.get('hasDirtyAttributes')) {
-        strain.save().then((strain) => {
-          this.transitionToRoute('protected.strains.show', strain);
-        }, () => {
-          ajaxError(strain.get('errors'), this.get('flashMessages'));
-        });
-      } else {
-        strain.destroyRecord().then(() => {
-          this.transitionToRoute('protected.strains.show', strain);
-        });
-      }
+export default Controller.extend(SaveModel, {
+  // Required for SaveModel mixin
+  fallbackRouteSave: 'protected.strains.show',
+  fallbackRouteCancel: 'protected.strains.show',
+
+  actions: {
+    addCharacteristic: function() {
+      return this.store.createRecord('measurement', {
+        characteristic: this.store.createRecord('characteristic', { sortOrder: -999 }),
+      });
     },
 
-    cancel: function() {
-      let strain = this.get('strain');
+    saveMeasurement: function(measurement, properties) {
+      measurement.setProperties(properties);
+      measurement.save().then(() => {
+        this.get('flashMessages').clearMessages();
+      }, () => {
+        ajaxError(measurement.get('errors'), this.get('flashMessages'));
+      });
+    },
 
-      strain.get('errors').clear();
-      strain.rollbackAttributes();
-
-      this.transitionToRoute('protected.strains.show', strain);
+    deleteMeasurement: function(measurement) {
+      const characteristic = measurement.get('characteristic');
+      if (characteristic.get('isNew')) {
+        characteristic.destroyRecord();
+      }
+      measurement.destroyRecord();
     },
 
   },
diff --git a/app/pods/protected/strains/edit/route.js b/app/pods/protected/strains/edit/route.js
index ee75d51..f8d8619 100644
--- a/app/pods/protected/strains/edit/route.js
+++ b/app/pods/protected/strains/edit/route.js
@@ -1,35 +1,44 @@
 import Ember from 'ember';
+import ElevatedAccess from '../../../../mixins/elevated-access';
 
-export default Ember.Route.extend({
-  currentUser: Ember.inject.service('session-account'),
+const { Route } = Ember;
 
-  beforeModel: function(transition) {
-    this._super(transition);
-    this.get('currentUser.account').then((user) => {
-      if (user.get('isReader')) {
-        this.transitionTo('protected.strains.index');
-      }
-    });
-  },
+export default Route.extend(ElevatedAccess, {
+  // Required for ElevatedAccess mixin
+  fallbackRouteBefore: 'protected.strains.index',
+  fallbackRouteAfter: 'protected.strains.show',
 
   model: function(params) {
     return Ember.RSVP.hash({
-      strain: this.store.find('strain', params.strain_id),
+      strain: this.store.findRecord('strain', params.strain_id),
       species: this.store.findAll('species'), // Need for dropdown
+      characteristics: this.store.findAll('characteristic'), // Need for dropdown
     });
   },
 
+  // Overriding afterModel because of RSVP hash
   afterModel: function(models) {
-    if (!models.strain.get('canEdit')) {
-      this.transitionTo('strains.show', models.strain.get('id'));
+    if (!models.strain.get('isNew') && !models.strain.get('canEdit')) {
+      this.transitionTo(this.get('fallbackRouteAfter'), models.strain.get('id'));
     }
   },
 
+  // Setting up controller because of RSVP hash
   setupController: function(controller, models) {
-    controller.setProperties(models);
-    this.get('currentUser.account').then((user) => {
-      controller.set('metaData', user.get('metaData'));
-    });
+    controller.set('model', models.strain);
+    controller.set('speciesList', models.species);
+    controller.set('allCharacteristics', models.characteristics);
   },
 
+  actions: {
+    // Overriding willTransition because of RSVP hash
+    willTransition: function(/*transition*/) {
+      const controller = this.get('controller');
+      const model = controller.get('model');
+
+      if (model.get('isNew')) {
+        model.destroyRecord();
+      }
+    },
+  },
 });
diff --git a/app/pods/protected/strains/edit/template.hbs b/app/pods/protected/strains/edit/template.hbs
index a4885d6..59d1633 100644
--- a/app/pods/protected/strains/edit/template.hbs
+++ b/app/pods/protected/strains/edit/template.hbs
@@ -1,8 +1,11 @@
 {{
   protected/strains/strain-form
-  strain=strain
-  species=species
-  canAdd=metaData.canAdd
-  save="save"
-  cancel="cancel"
+  strain=model
+  speciesList=speciesList
+  add-characteristic=(action "addCharacteristic")
+  allCharacteristics=allCharacteristics
+  save-measurement=(action "saveMeasurement")
+  delete-measurement=(action "deleteMeasurement")
+  on-save=(action "save")
+  on-cancel=(action "cancel")
 }}
diff --git a/app/pods/protected/strains/index/controller.js b/app/pods/protected/strains/index/controller.js
deleted file mode 100644
index ec348db..0000000
--- a/app/pods/protected/strains/index/controller.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import Ember from 'ember';
-
-export default Ember.Controller.extend({
-  sortParams: ['sortOrder'],
-  sortedStrains: Ember.computed.sort('model', 'sortParams'),
-});
diff --git a/app/pods/protected/strains/index/route.js b/app/pods/protected/strains/index/route.js
index e5582d7..627760f 100644
--- a/app/pods/protected/strains/index/route.js
+++ b/app/pods/protected/strains/index/route.js
@@ -1,17 +1,10 @@
 import Ember from 'ember';
 
-export default Ember.Route.extend({
-  currentUser: Ember.inject.service('session-account'),
+const { Route } = Ember;
 
+export default Route.extend({
   model: function() {
     return this.store.findAll('strain');
   },
 
-  setupController: function(controller, model) {
-    controller.set('model', model);
-    this.get('currentUser.account').then((user) => {
-      controller.set('metaData', user.get('metaData'));
-    });
-  },
-
 });
diff --git a/app/pods/protected/strains/index/strain-table/component.js b/app/pods/protected/strains/index/strain-table/component.js
new file mode 100644
index 0000000..7b3b21c
--- /dev/null
+++ b/app/pods/protected/strains/index/strain-table/component.js
@@ -0,0 +1,12 @@
+import Ember from 'ember';
+import SetupMetaData from '../../../../../mixins/setup-metadata';
+
+const { Component, computed: { sort } } = Ember;
+
+export default Component.extend(SetupMetaData, {
+  strains: null,
+
+  sortParams: ['fullName'],
+  sortedStrains: sort('strains', 'sortParams'),
+
+});
diff --git a/app/pods/protected/strains/index/strain-table/template.hbs b/app/pods/protected/strains/index/strain-table/template.hbs
new file mode 100644
index 0000000..bb13d76
--- /dev/null
+++ b/app/pods/protected/strains/index/strain-table/template.hbs
@@ -0,0 +1,26 @@
+<h3 id="total-strains">Total strains: {{strains.length}}</h3>
+
+{{add-button label="Add Strain" link="protected.strains.new" canAdd=metaData.canAdd}}
+
+<table class="flakes-table">
+  <thead>
+    <tr>
+      <th>Species</th>
+      <th>Total Measurements</th>
+    </tr>
+  </thead>
+  <tbody>
+    {{#each sortedStrains as |strain|}}
+      <tr>
+        <td>
+          {{#link-to 'protected.strains.show' strain classBinding="data.typeStrain:type-strain"}}
+            {{strain.fullNameMU}}
+          {{/link-to}}
+        </td>
+        <td>
+          {{strain.totalMeasurements}}
+        </td>
+      </tr>
+    {{/each}}
+  </tbody>
+</table>
diff --git a/app/pods/protected/strains/index/template.hbs b/app/pods/protected/strains/index/template.hbs
index 077d22a..d441386 100644
--- a/app/pods/protected/strains/index/template.hbs
+++ b/app/pods/protected/strains/index/template.hbs
@@ -1,27 +1,6 @@
 <h2>{{genus-name}} Strains</h2>
-<h3>Total strains: {{model.length}}</h3>
 
-{{add-button label="Add Strain" link="protected.strains.new" canAdd=metaData.canAdd}}
-
-<table class="flakes-table">
-  <thead>
-    <tr>
-      <th>Species</th>
-      <th>Total Measurements</th>
-    </tr>
-  </thead>
-  <tbody>
-    {{#each sortedStrains as |row|}}
-      <tr>
-        <td>
-          {{#link-to 'protected.strains.show' row classBinding="data.typeStrain:type-strain"}}
-            {{row.fullNameMU}}
-          {{/link-to}}
-        </td>
-        <td>
-          {{row.totalMeasurements}}
-        </td>
-      </tr>
-    {{/each}}
-  </tbody>
-</table>
+{{
+  protected/strains/index/strain-table
+  strains=model
+}}
diff --git a/app/pods/protected/strains/measurements-table-row/component.js b/app/pods/protected/strains/measurements-table-row/component.js
new file mode 100644
index 0000000..ad63dc9
--- /dev/null
+++ b/app/pods/protected/strains/measurements-table-row/component.js
@@ -0,0 +1,69 @@
+import Ember from 'ember';
+
+const { Component } = Ember;
+
+export default Component.extend({
+  tagName: 'tr',
+
+  // Read-only attributes
+  isEditing: false,
+  allCharacteristics: null,
+  measurement: null,
+  isDirty: null,
+
+  // Actions
+  "save-measurement": null,
+  "delete-measurement": null,
+
+  // Property mapping
+  propertiesList: ['characteristic', 'value', 'notes'],
+  characteristic: null,
+  value: null,
+  notes: null,
+
+  resetOnInit: Ember.on('init', function() {
+    this.get('propertiesList').forEach((field) => {
+      const valueInMeasurement = this.get('measurement').get(field);
+      this.set(field, valueInMeasurement);
+    });
+  }),
+
+  updateField: function(property, value) {
+    this.set(property, value);
+    // Manually compare against passed in value
+    if (this.get('measurement').get(property) !== value) {
+      this.set('isDirty', true);
+    } else {
+      this.set('isDirty', false);
+    }
+  },
+
+  actions: {
+    edit: function() {
+      this.toggleProperty('isEditing');
+    },
+
+    save: function() {
+      this.attrs['save-measurement'](this.get('measurement'), this.getProperties(this.get('propertiesList')));
+      this.toggleProperty('isEditing');
+    },
+
+    delete: function() {
+      this.attrs['delete-measurement'](this.get('measurement'));
+    },
+
+    characteristicDidChange: function(value) {
+      const newCharacteristic = this.get('allCharacteristics').findBy('id', value);
+      this.updateField('characteristic', newCharacteristic);
+    },
+
+    valueDidChange: function(value) {
+      this.updateField('value', value);
+    },
+
+    notesDidChange: function(value) {
+      this.updateField('notes', value);
+    },
+
+  },
+});
diff --git a/app/pods/protected/strains/measurements-table-row/template.hbs b/app/pods/protected/strains/measurements-table-row/template.hbs
new file mode 100644
index 0000000..0dc03b7
--- /dev/null
+++ b/app/pods/protected/strains/measurements-table-row/template.hbs
@@ -0,0 +1,52 @@
+{{#if isEditing}}
+  <td></td>
+  <td>
+    <select onchange={{action "characteristicDidChange" value="target.value"}}>
+      {{#each allCharacteristics as |characteristicChoice|}}
+        <option value={{characteristicChoice.id}} selected={{equal characteristic.id characteristicChoice.id}}>{{characteristicChoice.characteristicName}}</option>
+      {{/each}}
+    </select>
+  </td>
+  <td>
+    {{one-way-input type="text" class="measurement-value" value=value update=(action "valueDidChange")}}
+  </td>
+  <td>
+    {{one-way-input type="text" class="measurement-notes" value=notes update=(action "notesDidChange")}}
+  </td>
+  {{#if canEdit}}
+    <td>
+      {{#if isDirty}}
+      <button class="button-green smaller" {{action 'save'}}>
+        Save
+      </button>
+      {{else}}
+      <button class="button-gray smaller" {{action 'save'}}>
+        Cancel
+      </button>
+      {{/if}}
+    </td>
+  {{/if}}
+{{else}}
+  <td>
+    {{{measurement.characteristic.characteristicTypeName}}}
+  </td>
+  <td>
+    {{#link-to 'protected.characteristics.show' measurement.characteristic.id}}
+      {{{measurement.characteristic.characteristicName}}}
+    {{/link-to}}
+  </td>
+  <td>
+    {{measurement.value}}
+  </td>
+  <td>
+    {{measurement.notes}}
+  </td>
+  {{#if canEdit}}
+    <td>
+      <button class="button-gray smaller" {{action 'edit'}}>
+        Edit
+      </button>
+      {{delete-button delete=(action 'delete')}}
+    </td>
+  {{/if}}
+{{/if}}
diff --git a/app/pods/protected/strains/measurements-table/component.js b/app/pods/protected/strains/measurements-table/component.js
new file mode 100644
index 0000000..e4fd3a1
--- /dev/null
+++ b/app/pods/protected/strains/measurements-table/component.js
@@ -0,0 +1,55 @@
+import Ember from 'ember';
+
+const { Component, computed } = Ember;
+const { sort } = computed;
+
+export default Component.extend({
+  // Passed in
+  strain: null,
+  allCharacteristics: null,
+  canEdit: false,
+  canAdd: false,
+
+  // Actions
+  "add-characteristic": null,
+  "save-measurement": null,
+  "delete-measurement": null,
+
+  // Properties
+  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;
+  }),
+
+  actions: {
+    addCharacteristic: function() {
+      const newChar = this.attrs['add-characteristic']();
+      this.get('strain.measurements').addObject(newChar);
+    },
+
+    changeSortParam: function(col) {
+      const sort = this.get('sortAsc') ? 'asc' : 'desc';
+      this.set('sortParams', [`${col}:${sort}`]);
+      this.set('paramsChanged', true);
+      this.toggleProperty('sortAsc');
+    },
+
+    resetSortParam: function() {
+      this.set('sortParams', ['characteristic.characteristicTypeName', 'characteristic.sortOrder', 'characteristic.characteristicName']);
+      this.set('paramsChanged', false);
+      this.set('sortAsc', true);
+    },
+
+    saveMeasurement: function(measurement, properties) {
+      return this.attrs['save-measurement'](measurement, properties);
+    },
+
+    deleteMeasurement: function(measurement) {
+      return this.attrs['delete-measurement'](measurement);
+    },
+  },
+
+});
diff --git a/app/pods/protected/strains/show/loading/template.hbs b/app/pods/protected/strains/measurements-table/loading/template.hbs
similarity index 100%
rename from app/pods/protected/strains/show/loading/template.hbs
rename to app/pods/protected/strains/measurements-table/loading/template.hbs
diff --git a/app/pods/protected/strains/show/measurements-table/template.hbs b/app/pods/protected/strains/measurements-table/template.hbs
similarity index 70%
rename from app/pods/protected/strains/show/measurements-table/template.hbs
rename to app/pods/protected/strains/measurements-table/template.hbs
index a9a45dd..9e22393 100644
--- a/app/pods/protected/strains/show/measurements-table/template.hbs
+++ b/app/pods/protected/strains/measurements-table/template.hbs
@@ -1,17 +1,17 @@
 {{#if canAdd}}
-<br>
-<button class="button-green smaller" {{action "addCharacteristic"}}>
-  Add characteristic
-</button>
-<br><br>
+  <br>
+  <button class="button-green smaller" {{action "addCharacteristic"}}>
+    Add characteristic
+  </button>
+  <br><br>
 {{/if}}
 
 {{#if measurementsPresent}}
-{{#if paramsChanged}}
-  <button class="button-gray smaller" {{action 'resetSortParam'}}>
-    Reset sort
-  </button>
-{{/if}}
+  {{#if paramsChanged}}
+    <button class="button-gray smaller" {{action 'resetSortParam'}}>
+      Reset sort
+    </button>
+  {{/if}}
 <table class="flakes-table">
   <colgroup>
     {{#if canEdit}}
@@ -41,8 +41,11 @@
   <tbody>
     {{#each sortedMeasurements as |measurement|}}
       {{
-        protected/strains/show/measurements-table-row
-        row=measurement
+        protected/strains/measurements-table-row
+        measurement=measurement
+        save-measurement=(action "saveMeasurement")
+        delete-measurement=(action "deleteMeasurement")
+        allCharacteristics=allCharacteristics
         canEdit=canEdit
       }}
     {{/each}}
diff --git a/app/pods/protected/strains/new/controller.js b/app/pods/protected/strains/new/controller.js
index d3e1b36..a38edbb 100644
--- a/app/pods/protected/strains/new/controller.js
+++ b/app/pods/protected/strains/new/controller.js
@@ -1,29 +1,10 @@
 import Ember from 'ember';
-import ajaxError from '../../../../utils/ajax-error';
+import SaveModel from '../../../../mixins/save-model';
 
-export default Ember.Controller.extend({
-  actions: {
-    save: function() {
-      let strain = this.get('strain');
+const { Controller } = Ember;
 
-      if (strain.get('hasDirtyAttributes')) {
-        strain.save().then((strain) => {
-          this.transitionToRoute('protected.strains.show', strain);
-        }, () => {
-          ajaxError(strain.get('errors'), this.get('flashMessages'));
-        });
-      } else {
-        strain.destroyRecord().then(() => {
-          this.transitionToRoute('protected.strains.index');
-        });
-      }
-    },
-
-    cancel: function() {
-      this.get('strain').destroyRecord().then(() => {
-        this.transitionToRoute('protected.strains.index');
-      });
-    },
-
-  },
+export default Controller.extend(SaveModel, {
+  // Required for SaveModel mixin
+  fallbackRouteSave: 'protected.strains.show',
+  fallbackRouteCancel: 'protected.strains.index',
 });
diff --git a/app/pods/protected/strains/new/route.js b/app/pods/protected/strains/new/route.js
index 837b713..a9f4c6f 100644
--- a/app/pods/protected/strains/new/route.js
+++ b/app/pods/protected/strains/new/route.js
@@ -1,16 +1,12 @@
 import Ember from 'ember';
+import ElevatedAccess from '../../../../mixins/elevated-access';
 
-export default Ember.Route.extend({
-  currentUser: Ember.inject.service('session-account'),
+const { Route } = Ember;
 
-  beforeModel: function(transition) {
-    this._super(transition);
-    this.get('currentUser.account').then((user) => {
-      if (user.get('isReader')) {
-        this.transitionTo('protected.strains.index');
-      }
-    });
-  },
+export default Route.extend(ElevatedAccess, {
+  // Required for ElevatedAccess mixin
+  fallbackRouteBefore: 'protected.strains.index',
+  fallbackRouteAfter: 'protected.strains.show',
 
   model: function() {
     return Ember.RSVP.hash({
@@ -19,19 +15,28 @@ export default Ember.Route.extend({
     });
   },
 
+  // Overriding afterModel because of RSVP hash
+  afterModel: function(models) {
+    if (!models.strain.get('isNew') && !models.strain.get('canEdit')) {
+      this.transitionTo(this.get('fallbackRouteAfter'), models.strain.get('id'));
+    }
+  },
+
+  // Setting up controller because of RSVP hash
   setupController: function(controller, models) {
-    controller.setProperties(models);
+    controller.set('model', models.strain);
+    controller.set('speciesList', models.species);
   },
 
   actions: {
+    // Overriding willTransition because of RSVP hash
     willTransition: function(/*transition*/) {
       const controller = this.get('controller');
-      const strain = controller.get('strain');
+      const model = controller.get('model');
 
-      if (strain.get('isNew')) {
-        strain.destroyRecord();
+      if (model.get('isNew')) {
+        model.destroyRecord();
       }
     },
   },
-
 });
diff --git a/app/pods/protected/strains/new/template.hbs b/app/pods/protected/strains/new/template.hbs
index d9c4d43..1ae2d5b 100644
--- a/app/pods/protected/strains/new/template.hbs
+++ b/app/pods/protected/strains/new/template.hbs
@@ -1,7 +1,7 @@
 {{
   protected/strains/strain-form
-  strain=strain
-  species=species
-  save="save"
-  cancel="cancel"
+  strain=model
+  speciesList=speciesList
+  on-save=(action "save")
+  on-cancel=(action "cancel")
 }}
diff --git a/app/pods/protected/strains/show/controller.js b/app/pods/protected/strains/show/controller.js
index 7128b9a..e5e3e77 100644
--- a/app/pods/protected/strains/show/controller.js
+++ b/app/pods/protected/strains/show/controller.js
@@ -1,12 +1,9 @@
 import Ember from 'ember';
+import DeleteModel from '../../../../mixins/delete-model';
 
-export default Ember.Controller.extend({
-  actions: {
-    delete: function() {
-      this.get('model').destroyRecord().then(() => {
-        this.transitionToRoute('protected.strains.index');
-      });
-    },
-  },
+const { Controller } = Ember;
 
+export default Controller.extend(DeleteModel, {
+  // Required for DeleteModel mixin
+  transitionRoute: 'protected.strains.index',
 });
diff --git a/app/pods/protected/strains/show/measurements-table-row/component.js b/app/pods/protected/strains/show/measurements-table-row/component.js
deleted file mode 100644
index b4220cd..0000000
--- a/app/pods/protected/strains/show/measurements-table-row/component.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import Ember from 'ember';
-import ajaxError from '../../../../../utils/ajax-error';
-
-export default Ember.Component.extend({
-  tagName: 'tr',
-  isEditing: false,
-
-  oldCharacteristicId: function() {
-    let json = this.get('row').toJSON();
-    return json.characteristic;
-  }.property(),
-
-  rowChanged: Ember.computed('row.notes', 'row.value', 'row.characteristic.id', function() {
-    return this.get('row.hasDirtyAttributes') ||
-      this.get('oldCharacteristicId') !== this.get('row.characteristic.id');
-  }),
-
-  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() {
-      if (this.get('rowChanged')) {
-        this.get('row').save().then(() => {
-          this.get('flashMessages').clearMessages();
-          this.toggleProperty('isEditing');
-        }, () => {
-          ajaxError(this.get('row.errors'), this.get('flashMessages'));
-        });
-      } else {
-        this.toggleProperty('isEditing');
-      }
-    },
-
-    delete: function() {
-      let char = this.get('row.characteristic');
-      if (char.get('isNew')) {
-        char.destroyRecord();
-      }
-      this.get('row').destroyRecord();
-    }
-
-  },
-});
diff --git a/app/pods/protected/strains/show/measurements-table-row/template.hbs b/app/pods/protected/strains/show/measurements-table-row/template.hbs
deleted file mode 100644
index a26fef4..0000000
--- a/app/pods/protected/strains/show/measurements-table-row/template.hbs
+++ /dev/null
@@ -1,54 +0,0 @@
-{{#if isEditing}}
-  <td></td>
-  <td>
-    {{
-      select-2
-      multiple=false
-      content=characteristics
-      value=row.characteristic
-      optionLabelPath="characteristicName"
-    }}
-  </td>
-  <td>
-    {{input value=row.value}}
-  </td>
-  <td>
-    {{input value=row.notes}}
-  </td>
-  {{#if canEdit}}
-    <td>
-      {{#if rowChanged}}
-      <button class="button-green smaller" {{action 'save'}}>
-        Save
-      </button>
-      {{else}}
-      <button class="button-gray smaller" {{action 'save'}}>
-        Cancel
-      </button>
-      {{/if}}
-    </td>
-  {{/if}}
-{{else}}
-  <td>
-    {{{row.characteristic.characteristicTypeName}}}
-  </td>
-  <td>
-    {{#link-to 'protected.characteristics.show' row.characteristic.id}}
-      {{{row.characteristic.characteristicName}}}
-    {{/link-to}}
-  </td>
-  <td>
-    {{row.value}}
-  </td>
-  <td>
-    {{row.notes}}
-  </td>
-  {{#if canEdit}}
-    <td>
-      <button class="button-gray smaller" {{action 'edit'}}>
-        Edit
-      </button>
-      {{delete-button delete=(action 'delete')}}
-    </td>
-  {{/if}}
-{{/if}}
diff --git a/app/pods/protected/strains/show/measurements-table/component.js b/app/pods/protected/strains/show/measurements-table/component.js
deleted file mode 100644
index 07d94c6..0000000
--- a/app/pods/protected/strains/show/measurements-table/component.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import Ember from 'ember';
-
-export default Ember.Component.extend({
-  measurementsPresent: function() {
-    return this.get('model.measurements.length') > 0;
-  }.property('model.measurements'),
-
-  fetchCharacteristics: function() {
-    if (this.get('canEdit')) {
-      this.store.findAll('characteristic');
-    }
-  }.on('didInsertElement'),
-
-  sortParams: ['characteristic.characteristicTypeName', 'characteristic.sortOrder', 'characteristic.characteristicName'],
-  sortAsc: true,
-  paramsChanged: false,
-  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);
-    },
-
-    changeSortParam: function(col) {
-      let sort = this.get('sortAsc') ? 'asc' : 'desc';
-      let sortCol = `${col}:${sort}`;
-      this.set('sortParams', [sortCol]);
-      this.set('paramsChanged', true);
-      this.toggleProperty('sortAsc');
-      return false;
-    },
-
-    resetSortParam: function() {
-      this.set('sortParams', ['characteristic.characteristicTypeName', 'characteristic.sortOrder', 'characteristic.characteristicName']);
-      this.set('paramsChanged', false);
-      this.set('sortAsc', true);
-      return false;
-    },
-  },
-
-});
diff --git a/app/pods/protected/strains/show/route.js b/app/pods/protected/strains/show/route.js
index 0a17d8b..ea320bd 100644
--- a/app/pods/protected/strains/show/route.js
+++ b/app/pods/protected/strains/show/route.js
@@ -1,8 +1,10 @@
 import Ember from 'ember';
 
-export default Ember.Route.extend({
+const { Route } = Ember;
+
+export default Route.extend({
   model: function(params) {
-    return this.store.findRecord('strain', params.strain_id, { reload: true });
+    return this.store.findRecord('strain', params.strain_id);
   },
 
 });
diff --git a/app/pods/protected/strains/show/strain-card/component.js b/app/pods/protected/strains/show/strain-card/component.js
new file mode 100644
index 0000000..40802c8
--- /dev/null
+++ b/app/pods/protected/strains/show/strain-card/component.js
@@ -0,0 +1,14 @@
+import Ember from 'ember';
+
+const { Component } = Ember;
+
+export default Component.extend({
+  strain: null,
+  "on-delete": null,
+
+  actions: {
+    deleteStrain: function() {
+      return this.attrs['on-delete']();
+    },
+  },
+});
diff --git a/app/pods/protected/strains/show/strain-card/template.hbs b/app/pods/protected/strains/show/strain-card/template.hbs
new file mode 100644
index 0000000..995326a
--- /dev/null
+++ b/app/pods/protected/strains/show/strain-card/template.hbs
@@ -0,0 +1,105 @@
+<div class="span-1">
+  <fieldset class="flakes-information-box">
+    <legend>
+      {{strain.strainNameMU}}
+    </legend>
+
+    {{! ROW 1 }}
+    <div class="grid-2 gutter-20">
+      <dl class="span-1">
+        <dt>Species</dt>
+        <dd>
+          {{#link-to 'protected.species.show' strain.species.id}}
+            <em>{{strain.species.speciesNameMU}}</em>
+          {{/link-to}}
+        </dd>
+      </dl>
+      <dl class="span-1">
+        <dt>Type Strain?</dt>
+        <dd>
+          {{if strain.typeStrain 'Yes' 'No'}}
+        </dd>
+      </dl>
+    </div>
+
+    {{! ROW 2 }}
+    <div class="grid-3 gutter-20">
+      <dl class="span-1">
+        <dt>Accession Numbers</dt>
+        <dd>
+          {{strain.accessionNumbers}}
+        </dd>
+      </dl>
+      <dl class="span-1">
+        <dt>Genbank</dt>
+        <dd>
+          {{genbank-url genbank=strain.genbank}}
+        </dd>
+      </dl>
+      <dl class="span-1">
+        <dt>Whole Genome Sequence</dt>
+        <dd>
+          {{genbank-url genbank=strain.wholeGenomeSequence}}
+        </dd>
+      </dl>
+    </div>
+
+    {{! ROW 3 }}
+    <div class="grid-1 gutter-20">
+      <dl class="span-1">
+        <dt>Isolated From</dt>
+        <dd>
+          {{{strain.isolatedFrom}}}
+        </dd>
+      </dl>
+    </div>
+
+    {{! ROW 4 }}
+    <div class="grid-1 gutter-20">
+      <dl class="span-1">
+        <dt>Notes</dt>
+        <dd>
+          {{#if strain.notes}}
+            {{{strain.notes}}}
+          {{else}}
+            No notes.
+          {{/if}}
+        </dd>
+      </dl>
+    </div>
+
+    {{! ROW 5 }}
+    <div class="grid-1 gutter-20">
+      <dl class="span-1">
+        <dt>Characteristics</dt>
+        <dd>
+          {{
+            protected/strains/measurements-table
+            strain=strain
+            canEdit=false
+            canAdd=false
+          }}
+        </dd>
+      </dl>
+    </div>
+
+    {{! ROW 6 }}
+    <div class="grid-2 gutter-20">
+      <dl class="span-1">
+        <dt>Record Created</dt>
+        <dd>{{null-time strain.createdAt 'LL'}}</dd>
+      </dl>
+      <dl class="span-1">
+        <dt>Record Updated</dt>
+        <dd>{{null-time strain.updatedAt 'LL'}}</dd>
+      </dl>
+    </div>
+  </fieldset>
+</div>
+{{#if strain.canEdit}}
+  <br>
+  {{#link-to 'protected.strains.edit' strain.id class="button-gray smaller"}}
+    Edit
+  {{/link-to}}
+  {{delete-button delete=(action 'deleteStrain')}}
+{{/if}}
diff --git a/app/pods/protected/strains/show/template.hbs b/app/pods/protected/strains/show/template.hbs
index 8a10e60..32d23d6 100644
--- a/app/pods/protected/strains/show/template.hbs
+++ b/app/pods/protected/strains/show/template.hbs
@@ -1,105 +1,5 @@
-<div class="span-1">
-  <fieldset class="flakes-information-box">
-    <legend>
-      Strain {{model.strainNameMU}}
-    </legend>
-
-    {{! ROW 1 }}
-    <div class="grid-2 gutter-20">
-      <dl class="span-1">
-        <dt>Species</dt>
-        <dd>
-          {{#link-to 'protected.species.show' model.species.id}}
-            <em>{{model.species.speciesNameMU}}</em>
-          {{/link-to}}
-        </dd>
-      </dl>
-      <dl class="span-1">
-        <dt>Type Strain?</dt>
-        <dd>
-          {{if model.typeStrain 'Yes' 'No'}}
-        </dd>
-      </dl>
-    </div>
-
-    {{! ROW 2 }}
-    <div class="grid-3 gutter-20">
-      <dl class="span-1">
-        <dt>Accession Numbers</dt>
-        <dd>
-          {{model.accessionNumbers}}
-        </dd>
-      </dl>
-      <dl class="span-1">
-        <dt>Genbank</dt>
-        <dd>
-          {{genbank-url genbank=model.genbank}}
-        </dd>
-      </dl>
-      <dl class="span-1">
-        <dt>Whole Genome Sequence</dt>
-        <dd>
-          {{genbank-url genbank=model.wholeGenomeSequence}}
-        </dd>
-      </dl>
-    </div>
-
-    {{! ROW 3 }}
-    <div class="grid-1 gutter-20">
-      <dl class="span-1">
-        <dt>Isolated From</dt>
-        <dd>
-          {{{model.isolatedFrom}}}
-        </dd>
-      </dl>
-    </div>
-
-    {{! ROW 4 }}
-    <div class="grid-1 gutter-20">
-      <dl class="span-1">
-        <dt>Notes</dt>
-        <dd>
-          {{#if model.notes}}
-            {{{model.notes}}}
-          {{else}}
-            No notes.
-          {{/if}}
-        </dd>
-      </dl>
-    </div>
-
-    {{! ROW 5 }}
-    <div class="grid-1 gutter-20">
-      <dl class="span-1">
-        <dt>Characteristics</dt>
-        <dd>
-          {{
-            protected/strains/show/measurements-table
-            model=model
-            canEdit=false
-            canAdd=false
-          }}
-        </dd>
-      </dl>
-    </div>
-
-    {{! ROW 6 }}
-    <div class="grid-2 gutter-20">
-      <dl class="span-1">
-        <dt>Record Created</dt>
-        <dd>{{null-time model.createdAt 'LL'}}</dd>
-      </dl>
-      <dl class="span-1">
-        <dt>Record Updated</dt>
-        <dd>{{null-time model.updatedAt 'LL'}}</dd>
-      </dl>
-    </div>
-  </fieldset>
-</div>
-{{#if model.canEdit}}
-  <br>
-  {{#link-to 'protected.strains.edit' model.id class="button-gray smaller"}}
-    Edit
-  {{/link-to}}
-  {{delete-button delete=(action 'delete')}}
-{{/if}}
+{{
+  protected/strains/show/strain-card
+  strain=model
+  on-delete=(action 'delete')
+}}
diff --git a/app/pods/protected/strains/strain-form/component.js b/app/pods/protected/strains/strain-form/component.js
index 8ac9027..420db5f 100644
--- a/app/pods/protected/strains/strain-form/component.js
+++ b/app/pods/protected/strains/strain-form/component.js
@@ -1,21 +1,106 @@
 import Ember from 'ember';
+import SetupMetaData from '../../../../mixins/setup-metadata';
+
+const { Component } = Ember;
+
+export default Component.extend(SetupMetaData, {
+  // Read-only attributes
+  strain: null,
+  isNew: null,
+  isDirty: false,
+  speciesList: null,
+  allCharacteristics: null,
+
+  // Actions
+  "on-save": null,
+  "on-cancel": null,
+  "on-update": null,
+  "add-characteristic": null,
+  "save-measurement": null,
+  "delete-measurement": null,
+
+  // Property mapping
+  propertiesList: ['strainName', 'typeStrain', 'species', 'isolatedFrom', 'accessionNumbers', 'genbank', 'wholeGenomeSequence', 'notes'],
+  strainName: null,
+  typeStrain: null,
+  species: null,
+  isolatedFrom: null,
+  accessionNumbers: null,
+  genbank: null,
+  wholeGenomeSequence: null,
+  notes: null,
+
+  resetOnInit: Ember.on('init', function() {
+    this.get('propertiesList').forEach((field) => {
+      const valueInStrain = this.get('strain').get(field);
+      this.set(field, valueInStrain);
+    });
+    // Read-only attributes
+    this.set('isNew', this.get('strain.isNew'));
+  }),
+
+  updateField: function(property, value) {
+    this.set(property, value);
+    // Manually compare against passed in value
+    if (this.get('strain').get(property) !== value) {
+      this.set('isDirty', true);
+    } else {
+      this.set('isDirty', false);
+    }
+  },
 
-export default Ember.Component.extend({
   actions: {
     save: function() {
-      this.sendAction('save');
+      return this.attrs['on-save'](this.getProperties(this.get('propertiesList')));
     },
 
     cancel: function() {
-      this.sendAction('cancel');
+      return this.attrs['on-cancel']();
+    },
+
+    addCharacteristic: function() {
+      return this.attrs['add-characteristic']();
+    },
+
+    saveMeasurement: function(measurement, properties) {
+      return this.attrs['save-measurement'](measurement, properties);
+    },
+
+    deleteMeasurement: function(measurement) {
+      return this.attrs['delete-measurement'](measurement);
+    },
+
+    strainNameDidChange: function(value) {
+      this.updateField('strainName', value);
+    },
+
+    typeStrainDidChange: function() {
+      this.updateField('typeStrain', !this.get('typeStrain'));
+    },
+
+    speciesDidChange: function(value) {
+      const newSpecies = this.get('speciesList').findBy('id', value);
+      this.updateField('species', newSpecies);
     },
 
     isolatedFromDidChange: function(value) {
-      this.set('strain.isolatedFrom', value);
+      this.updateField('isolatedFrom', value);
+    },
+
+    accessionNumbersNameDidChange: function(value) {
+      this.updateField('accessionNumbers', value);
+    },
+
+    genbankDidChange: function(value) {
+      this.updateField('genbank', value);
+    },
+
+    wholeGenomeSequenceDidChange: function(value) {
+      this.updateField('wholeGenomeSequence', value);
     },
 
     notesDidChange: function(value) {
-      this.set('strain.notes', value);
+      this.updateField('strain.notes', value);
     },
   },
 });
diff --git a/app/pods/protected/strains/strain-form/template.hbs b/app/pods/protected/strains/strain-form/template.hbs
index 109d037..47c5112 100644
--- a/app/pods/protected/strains/strain-form/template.hbs
+++ b/app/pods/protected/strains/strain-form/template.hbs
@@ -1,68 +1,72 @@
 <form class="grid-form" {{action 'save' on='submit'}}>
   <fieldset>
-    <legend><em>{{strain.strainName}}</em></legend>
+    <legend><em>{{strainName}}</em></legend>
     <div data-row-span="2">
       <div data-field-span="1">
         <label>Strain Name</label>
-        {{input value=strain.strainName}}
+        {{one-way-input type="text" class="strain-name" value=strainName update=(action "strainNameDidChange")}}
       </div>
       <div data-field-span="1">
         <label>Type Strain?</label>
-        {{input type="checkbox" checked=strain.typeStrain}} {{if strain.typeStrain 'Yes' 'No'}}
+        <input type="checkbox" checked={{typeStrain}} value="{{typeStrain}}" onchange={{action "typeStrainDidChange"}}>
+        {{if typeStrain 'Yes' 'No'}}
       </div>
     </div>
     <div data-row-span="2">
       <div data-field-span="2">
         <label>Species</label>
-          {{
-            select-2
-            content=species
-            optionLabelPath="speciesName"
-            value=strain.species
-          }}
+        <select onchange={{action "speciesDidChange" value="target.value"}}>
+          {{#each speciesList as |speciesChoice|}}
+            <option value={{speciesChoice.id}} selected={{equal species.id speciesChoice.id}}>{{speciesChoice.speciesName}}</option>
+          {{/each}}
+        </select>
       </div>
     </div>
     <div data-row-span="2">
       <div data-field-span="2">
         <label>Isolated From</label>
-        {{text-editor value=strain.isolatedFrom update=(action "isolatedFromDidChange")}}
+        {{text-editor value=isolatedFrom update=(action "isolatedFromDidChange")}}
       </div>
     </div>
     <div data-row-span="3">
       <div data-field-span="1">
         <label>Accession Numbers</label>
-        {{input value=strain.accessionNumbers}}
+        {{one-way-input type="text" class="accession-numbers" value=accessionNumbers update=(action "accessionNumbersNameDidChange")}}
       </div>
       <div data-field-span="1">
         <label>GenBank</label>
-        {{input value=strain.genbank}}
+        {{one-way-input type="text" class="genbank" value=genbank update=(action "genbankDidChange")}}
       </div>
       <div data-field-span="1">
         <label>Whole Genome Sequence</label>
-        {{input value=strain.wholeGenomeSequence}}
+        {{one-way-input type="text" class="whole-genome-sequenc" value=wholeGenomeSequence update=(action "wholeGenomeSequenceDidChange")}}
       </div>
     </div>
     <div data-row-span="2">
       <div data-field-span="2">
         <label>Notes</label>
-        {{text-editor value=strain.notes update=(action "notesDidChange")}}
+        {{text-editor value=notes update=(action "notesDidChange")}}
       </div>
     </div>
   </fieldset>
   <div>
     {{
-      protected/strains/show/measurements-table
-      model=strain
+      protected/strains/measurements-table
+      strain=strain
+      add-characteristic=(action "addCharacteristic")
+      allCharacteristics=allCharacteristics
+      save-measurement=(action "saveMeasurement")
+      delete-measurement=(action "deleteMeasurement")
       canEdit=strain.canEdit
-      canAdd=canAdd
+      canAdd=metaData.canAdd
     }}
   </div>
   <br>
   <a class="button-red smaller" {{action 'cancel'}}>
     Cancel
   </a>
-  {{#if strain.hasDirtyAttributes}}
-    <button type="submit" class="button-green smaller">
+  {{#if isDirty}}
+    <button type="submit" class="button-green smaller save-strain">
       Save
     </button>
   {{/if}}
diff --git a/app/pods/protected/users/changepassword/controller.js b/app/pods/protected/users/changepassword/controller.js
index b8d100e..9119f1a 100644
--- a/app/pods/protected/users/changepassword/controller.js
+++ b/app/pods/protected/users/changepassword/controller.js
@@ -1,33 +1,23 @@
 import Ember from 'ember';
-import ajaxRequest from '../../../../utils/ajax-request';
 
-export default Ember.Controller.extend({
-  session: Ember.inject.service('session'),
-  currentUser: Ember.inject.service('session-account'),
+const { Controller, inject: { service } } = Ember;
 
-  passwordConfirm: null,
+export default Controller.extend({
+  session: service(),
+  ajax: service(),
+  currentUser: service('session-account'),
 
   actions: {
-    save: function() {
-      if (this.get('password') !== this.get('passwordConfirm')) {
-        this.get('flashMessages').clearMessages();
-        this.get('flashMessages').error("Password fields don't match");
-        return;
-      }
-
-      let url = `${this.get('globals.apiURL')}/api/${this.get('globals.genus')}/users/password`;
-      let options = {
-        method: 'POST',
-        data: {
-          id: this.get('currentUser.account.id'),
-          password: this.get('password'),
-        },
-      };
-      ajaxRequest(url, options, this.get('session'));
-      this.transitionToRoute('protected.users.index');
+    save: function(password) {
+      const id = this.get('currentUser.account.id');
+      const data = { id: id, password: password };
+      this.get('ajax').post('/users/password', { data: data });
+      this.transitionToRoute('protected.users.show', id);
       this.get('flashMessages').information('Your password has been changed.');
     },
 
+    cancel: function() {
+      this.transitionToRoute('protected.users.show', this.get('currentUser.account.id'));
+    },
   },
-
 });
diff --git a/app/pods/protected/users/changepassword/password-form/component.js b/app/pods/protected/users/changepassword/password-form/component.js
new file mode 100644
index 0000000..494885e
--- /dev/null
+++ b/app/pods/protected/users/changepassword/password-form/component.js
@@ -0,0 +1,52 @@
+import Ember from 'ember';
+
+const { Component } = Ember;
+
+export default Component.extend({
+  password: null,
+  passwordConfirm: null,
+  matches: false,
+
+  // Actions
+  "on-save": null,
+  "on-cancel": null,
+
+  updateField: function(property, value) {
+    this.set(property, value);
+    this.verifyPassword(this.get('password'), this.get('passwordConfirm'));
+  },
+
+  verifyPassword: function(password, passwordConfirm) {
+    if (password && passwordConfirm) {
+      if (password !== passwordConfirm) {
+        this.get('flashMessages').clearMessages();
+        this.get('flashMessages').error("Password fields don't match");
+        this.set('matches', false);
+      } else {
+        this.get('flashMessages').clearMessages();
+        this.set('matches', true);
+      }
+    }
+  },
+
+  actions: {
+    save: function() {
+      this.verifyPassword(this.get('password'), this.get('passwordConfirm'));
+      if (this.get('matches')) {
+        return this.attrs['on-save'](this.get('password'));
+      }
+    },
+
+    cancel: function() {
+      return this.attrs['on-cancel']();
+    },
+
+    passwordDidChange: function(value) {
+      this.updateField('password', value);
+    },
+
+    passwordConfirmDidChange: function(value) {
+      this.updateField('passwordConfirm', value);
+    },
+  },
+});
diff --git a/app/pods/protected/users/changepassword/password-form/template.hbs b/app/pods/protected/users/changepassword/password-form/template.hbs
new file mode 100644
index 0000000..5d30c35
--- /dev/null
+++ b/app/pods/protected/users/changepassword/password-form/template.hbs
@@ -0,0 +1,29 @@
+<div class="grid-1">
+  <div class="span-1">
+    <fieldset>
+      <legend>Change password</legend>
+      <form {{action 'save' on='submit'}}>
+        <ul>
+          <li>
+            <label>New Password</label>
+            {{one-way-input type="password" class="password" value=password update=(action "passwordDidChange")}}
+          </li>
+          <li>
+            <label>New Password (confirm)</label>
+            {{one-way-input type="password" class="password-confirm" value=passwordConfirm update=(action "passwordConfirmDidChange")}}
+          </li>
+          <li>
+            <a class="button-red smaller" {{action 'cancel'}}>
+              Cancel
+            </a>
+            {{#if matches}}
+              <button type="submit" class="button-green smaller submit-password">
+                Submit
+              </button>
+            {{/if}}
+          </li>
+        </ul>
+      </form>
+    </fieldset>
+  </div>
+</div>
diff --git a/app/pods/protected/users/changepassword/route.js b/app/pods/protected/users/changepassword/route.js
index ce869dd..f6da398 100644
--- a/app/pods/protected/users/changepassword/route.js
+++ b/app/pods/protected/users/changepassword/route.js
@@ -1,16 +1,19 @@
 import Ember from 'ember';
 
-export default Ember.Route.extend({
-  currentUser: Ember.inject.service('session-account'),
+const { Route, inject: { service } } = Ember;
+
+export default Route.extend({
+  currentUser: service('session-account'),
 
   beforeModel: function(transition) {
     this._super(transition);
 
-    let user_id = transition.params['protected.users.changepassword'].user_id;
+    // Only the logged in user can change their password
+    const user_id = transition.params['protected.users.changepassword'].user_id;
 
     this.get('currentUser.account').then((user) => {
       if (user.get('id') !== user_id) {
-        this.transitionTo('protected.users.index');
+        this.transitionTo('protected.users.show', user.get('id'));
       }
     });
   }
diff --git a/app/pods/protected/users/changepassword/template.hbs b/app/pods/protected/users/changepassword/template.hbs
index b22db6c..b7509c1 100644
--- a/app/pods/protected/users/changepassword/template.hbs
+++ b/app/pods/protected/users/changepassword/template.hbs
@@ -1,24 +1,5 @@
-<div class="grid-1">
-  <div class="span-1">
-    <fieldset>
-      <legend>Change password</legend>
-      <form {{action 'save' on='submit'}}>
-        <ul>
-          <li>
-            <label>New Password</label>
-            {{input type="password" value=password}}
-          </li>
-          <li>
-            <label>New Password (confirm)</label>
-            {{input type="password" value=passwordConfirm}}
-          </li>
-          <li>
-            <button type="submit" class="button-green smaller">
-              Submit
-            </button>
-          </li>
-        </ul>
-      </form>
-    </fieldset>
-  </div>
-</div>
+{{
+  protected/users/changepassword/password-form
+  on-save=(action "save")
+  on-cancel=(action "cancel")
+}}
diff --git a/app/pods/protected/users/edit/controller.js b/app/pods/protected/users/edit/controller.js
index 955c328..283631c 100644
--- a/app/pods/protected/users/edit/controller.js
+++ b/app/pods/protected/users/edit/controller.js
@@ -1,40 +1,10 @@
 import Ember from 'ember';
-import ajaxError from '../../../../utils/ajax-error';
+import SaveModel from '../../../../mixins/save-model';
 
-export default Ember.Controller.extend({
-  actions: {
-    save: function() {
-      let user = this.get('model');
+const { Controller } = Ember;
 
-      if (user.get('hasDirtyAttributes')) {
-        let attrs = user.changedAttributes(), roleChanged = false;
-        if (attrs.role) {
-          roleChanged = true;
-        }
-        user.save().then((user) => {
-          this.get('flashMessages').clearMessages();
-          if (roleChanged) {
-            // Need to clear the store so that canEdit and canAdd
-            // attributes reflect the new role.
-            this.get('store').unloadAll();
-          }
-          this.transitionToRoute('protected.users.show', user);
-        }, () => {
-          ajaxError(user.get('errors'), this.get('flashMessages'));
-        });
-      } else {
-        this.transitionToRoute('protected.users.show', user);
-      }
-    },
-
-    cancel: function() {
-      let user = this.get('model');
-
-      user.get('errors').clear();
-      user.rollbackAttributes();
-
-      this.transitionToRoute('protected.users.show', user);
-    },
-
-  },
+export default Controller.extend(SaveModel, {
+  // Required for SaveModel mixin
+  fallbackRouteSave: 'protected.users.show',
+  fallbackRouteCancel: 'protected.users.show',
 });
diff --git a/app/pods/protected/users/edit/route.js b/app/pods/protected/users/edit/route.js
index b95bdb2..c91288e 100644
--- a/app/pods/protected/users/edit/route.js
+++ b/app/pods/protected/users/edit/route.js
@@ -1,8 +1,12 @@
 import Ember from 'ember';
 
-export default Ember.Route.extend({
-  currentUser: Ember.inject.service('session-account'),
+const { Route, inject: { service } } = Ember;
 
+export default Route.extend({
+  currentUser: service('session-account'),
+
+  // Not using ElevatedAccess Mixin because the rules for viewing user accounts
+  // is slightly different.
   beforeModel: function(transition) {
     this._super(transition);
 
@@ -16,7 +20,7 @@ export default Ember.Route.extend({
   },
 
   model: function(params) {
-    return this.store.findRecord('user', params.user_id, { reload: true });
+    return this.store.findRecord('user', params.user_id);
   },
 
 });
diff --git a/app/pods/protected/users/edit/template.hbs b/app/pods/protected/users/edit/template.hbs
index e53c6e8..60cbe0d 100644
--- a/app/pods/protected/users/edit/template.hbs
+++ b/app/pods/protected/users/edit/template.hbs
@@ -1,7 +1,6 @@
 {{
   protected/users/user-form
   user=model
-  currentUser=currentUser.account
-  save="save"
-  cancel="cancel"
+  on-save=(action "save")
+  on-cancel=(action "cancel")
 }}
diff --git a/app/pods/protected/users/index/route.js b/app/pods/protected/users/index/route.js
index 8429726..2752983 100644
--- a/app/pods/protected/users/index/route.js
+++ b/app/pods/protected/users/index/route.js
@@ -1,7 +1,9 @@
 import Ember from 'ember';
 
-export default Ember.Route.extend({
-  currentUser: Ember.inject.service('session-account'),
+const { Route, inject: { service } } = Ember;
+
+export default Route.extend({
+  currentUser: service('session-account'),
 
   beforeModel: function(transition) {
     this._super(transition);
diff --git a/app/pods/protected/users/index/template.hbs b/app/pods/protected/users/index/template.hbs
index adb5b55..f75072a 100644
--- a/app/pods/protected/users/index/template.hbs
+++ b/app/pods/protected/users/index/template.hbs
@@ -1,33 +1,6 @@
 <h2>{{genus-name}} Users</h2>
-<h3>Total users: {{model.length}}</h3>
 
-<table class="flakes-table">
-  <thead>
-    <tr>
-      <th>Name</th>
-      <th>Email</th>
-      <th>Role</th>
-      <th>Date Registered</th>
-    </tr>
-  </thead>
-  <tbody>
-    {{#each model as |row|}}
-      <tr>
-        <td>
-          {{#link-to 'protected.users.show' row}}
-            {{row.name}}
-          {{/link-to}}
-        </td>
-        <td>
-          {{row.email}}
-        </td>
-        <td>
-          {{row.fullRole}}
-        </td>
-        <td>
-          {{null-time row.createdAt 'LL'}}
-        </td>
-      </tr>
-    {{/each}}
-  </tbody>
-</table>
+{{
+  protected/users/index/users-table
+  users=model
+}}
diff --git a/app/pods/protected/users/index/users-table/component.js b/app/pods/protected/users/index/users-table/component.js
new file mode 100644
index 0000000..2abad45
--- /dev/null
+++ b/app/pods/protected/users/index/users-table/component.js
@@ -0,0 +1,7 @@
+import Ember from 'ember';
+
+const { Component } = Ember;
+
+export default Component.extend({
+  users: null,
+});
diff --git a/app/pods/protected/users/index/users-table/template.hbs b/app/pods/protected/users/index/users-table/template.hbs
new file mode 100644
index 0000000..ad2a064
--- /dev/null
+++ b/app/pods/protected/users/index/users-table/template.hbs
@@ -0,0 +1,33 @@
+
+<h3 id="total-users">Total users: {{users.length}}</h3>
+
+<table class="flakes-table">
+  <thead>
+    <tr>
+      <th>Name</th>
+      <th>Email</th>
+      <th>Role</th>
+      <th>Date Registered</th>
+    </tr>
+  </thead>
+  <tbody>
+    {{#each users as |user|}}
+      <tr>
+        <td>
+          {{#link-to 'protected.users.show' user}}
+            {{user.name}}
+          {{/link-to}}
+        </td>
+        <td>
+          {{user.email}}
+        </td>
+        <td>
+          {{user.fullRole}}
+        </td>
+        <td>
+          {{null-time user.createdAt 'LL'}}
+        </td>
+      </tr>
+    {{/each}}
+  </tbody>
+</table>
diff --git a/app/pods/protected/strains/show/measurements-table/loading/template.hbs b/app/pods/protected/users/loading/template.hbs
similarity index 100%
rename from app/pods/protected/strains/show/measurements-table/loading/template.hbs
rename to app/pods/protected/users/loading/template.hbs
diff --git a/app/pods/protected/users/show/controller.js b/app/pods/protected/users/show/controller.js
index 3c6c549..26c243d 100644
--- a/app/pods/protected/users/show/controller.js
+++ b/app/pods/protected/users/show/controller.js
@@ -1,9 +1,9 @@
 import Ember from 'ember';
+import DeleteModel from '../../../../mixins/delete-model';
 
-export default Ember.Controller.extend({
-  currentUser: Ember.inject.service('session-account'),
+const { Controller } = Ember;
 
-  isUser: Ember.computed('model.id', 'currentUser.account.id', function() {
-    return this.get('model.id') === this.get('currentUser.account.id');
-  }),
+export default Controller.extend(DeleteModel, {
+  // Required for DeleteModel mixin
+  transitionRoute: 'protected.index',
 });
diff --git a/app/pods/protected/users/show/route.js b/app/pods/protected/users/show/route.js
index a0c9fd9..798787d 100644
--- a/app/pods/protected/users/show/route.js
+++ b/app/pods/protected/users/show/route.js
@@ -1,21 +1,25 @@
 import Ember from 'ember';
 
-export default Ember.Route.extend({
-  currentUser: Ember.inject.service('session-account'),
+const { Route, inject: { service } } = Ember;
 
+export default Route.extend({
+  currentUser: service('session-account'),
+
+  // Not using ElevatedAccess Mixin because the rules for viewing user accounts
+  // is slightly different.
   beforeModel: function(transition) {
     this._super(transition);
 
-    this.get('currentUser.account').then((currentUser) => {
-      let user_id = transition.params['protected.users.show'].user_id;
-      if (!currentUser.get('isAdmin') && currentUser.get('id') !== user_id) {
+    this.get('currentUser.account').then((user) => {
+      const user_id = transition.params['protected.users.show'].user_id;
+      if (!user.get('isAdmin') && user.get('id') !== user_id) {
         this.transitionTo('protected.users.index');
       }
     });
   },
 
   model: function(params) {
-    return this.store.findRecord('user', params.user_id, { reload: true });
+    return this.store.findRecord('user', params.user_id);
   },
 
 });
diff --git a/app/pods/protected/users/show/template.hbs b/app/pods/protected/users/show/template.hbs
index ca89688..a8648c4 100644
--- a/app/pods/protected/users/show/template.hbs
+++ b/app/pods/protected/users/show/template.hbs
@@ -1,53 +1,5 @@
-<div class="span-1">
-  <fieldset class="flakes-information-box">
-    <legend>
-      {{model.name}}
-    </legend>
-
-    {{! ROW 1 }}
-    <div class="grid-2 gutter-20">
-      <dl class="span-1">
-        <dt>Email</dt>
-        <dd>
-          {{model.email}}
-        </dd>
-      </dl>
-      <dl class="span-1">
-        <dt>Role</dt>
-        <dd>
-          {{model.fullRole}}
-        </dd>
-      </dl>
-    </div>
-
-    {{! ROW 2 }}
-    <div class="grid-2 gutter-20">
-      <dl class="span-1">
-        <dt>Record Created</dt>
-        <dd>{{null-time model.createdAt 'LL'}}</dd>
-      </dl>
-      <dl class="span-1">
-        <dt>Record Updated</dt>
-        <dd>{{null-time model.updatedAt 'LL'}}</dd>
-      </dl>
-    </div>
-  </fieldset>
-</div>
-<br>
-<div class="grid-2 gutter-20">
-  {{#if isUser}}
-    <div class="span-1">
-      {{#link-to 'protected.users.changepassword' model.id class="button-gray smaller"}}
-        Change Password
-      {{/link-to}}
-    </div>
-  {{/if}}
-
-  <div class="span-1">
-    {{#if model.canEdit}}
-      {{#link-to 'protected.users.edit' model.id class="button-gray smaller"}}
-        Edit
-      {{/link-to}}
-    {{/if}}
-  </div>
-</div>
+{{
+  protected/users/show/user-card
+  user=model
+  on-delete=(action 'delete')
+}}
diff --git a/app/pods/protected/users/show/user-card/component.js b/app/pods/protected/users/show/user-card/component.js
new file mode 100644
index 0000000..00e3164
--- /dev/null
+++ b/app/pods/protected/users/show/user-card/component.js
@@ -0,0 +1,13 @@
+import Ember from 'ember';
+
+const { Component, computed, inject: { service } } = Ember;
+
+export default Component.extend({
+  currentUser: service('session-account'),
+
+  user: null,
+
+  isUser: computed('user.id', 'currentUser.account.id', function() {
+    return this.get('user.id') === this.get('currentUser.account.id');
+  }),
+});
diff --git a/app/pods/protected/users/show/user-card/template.hbs b/app/pods/protected/users/show/user-card/template.hbs
new file mode 100644
index 0000000..5ced125
--- /dev/null
+++ b/app/pods/protected/users/show/user-card/template.hbs
@@ -0,0 +1,53 @@
+<div class="span-1">
+  <fieldset class="flakes-information-box">
+    <legend>
+      {{user.name}}
+    </legend>
+
+    {{! ROW 1 }}
+    <div class="grid-2 gutter-20">
+      <dl class="span-1">
+        <dt>Email</dt>
+        <dd>
+          {{user.email}}
+        </dd>
+      </dl>
+      <dl class="span-1">
+        <dt>Role</dt>
+        <dd>
+          {{user.fullRole}}
+        </dd>
+      </dl>
+    </div>
+
+    {{! ROW 2 }}
+    <div class="grid-2 gutter-20">
+      <dl class="span-1">
+        <dt>Record Created</dt>
+        <dd>{{null-time user.createdAt 'LL'}}</dd>
+      </dl>
+      <dl class="span-1">
+        <dt>Record Updated</dt>
+        <dd>{{null-time user.updatedAt 'LL'}}</dd>
+      </dl>
+    </div>
+  </fieldset>
+</div>
+<br>
+<div class="grid-2 gutter-20">
+  {{#if isUser}}
+    <div class="span-1">
+      {{#link-to 'protected.users.changepassword' user.id class="button-gray smaller"}}
+        Change Password
+      {{/link-to}}
+    </div>
+  {{/if}}
+
+  <div class="span-1">
+    {{#if user.canEdit}}
+      {{#link-to 'protected.users.edit' user.id class="button-gray smaller"}}
+        Edit
+      {{/link-to}}
+    {{/if}}
+  </div>
+</div>
diff --git a/app/pods/protected/users/user-form/component.js b/app/pods/protected/users/user-form/component.js
index 0a706f3..28fb03a 100644
--- a/app/pods/protected/users/user-form/component.js
+++ b/app/pods/protected/users/user-form/component.js
@@ -1,15 +1,61 @@
 import Ember from 'ember';
+import SetupMetaData from '../../../../mixins/setup-metadata';
 
-export default Ember.Component.extend({
+const { Component } = Ember;
+
+export default Component.extend(SetupMetaData, {
+  // Read-only attributes
+  user: null,
+  isDirty: false,
   roles: Ember.String.w('A R W'),
 
+  // Actions
+  "on-save": null,
+  "on-cancel": null,
+  "on-update": null,
+
+  // Property mapping
+  propertiesList: ['name', 'email', 'role'],
+  name: null,
+  email: null,
+  role: null,
+
+  resetOnInit: Ember.on('init', function() {
+    this.get('propertiesList').forEach((field) => {
+      const valueInUser = this.get('user').get(field);
+      this.set(field, valueInUser);
+    });
+  }),
+
+  updateField: function(property, value) {
+    this.set(property, value);
+    // Manually compare against passed in value
+    if (this.get('user').get(property) !== value) {
+      this.set('isDirty', true);
+    } else {
+      this.set('isDirty', false);
+    }
+  },
+
   actions: {
     save: function() {
-      this.sendAction('save');
+      return this.attrs['on-save'](this.getProperties(this.get('propertiesList')));
     },
 
     cancel: function() {
-      this.sendAction('cancel');
+      return this.attrs['on-cancel']();
     },
-  }
+
+    nameDidChange: function(value) {
+      this.updateField('name', value);
+    },
+
+    emailDidChange: function(value) {
+      this.updateField('email', value);
+    },
+
+    roleDidChange: function(value) {
+      this.updateField('role', value);
+    },
+  },
 });
diff --git a/app/pods/protected/users/user-form/template.hbs b/app/pods/protected/users/user-form/template.hbs
index c6209a9..cb0e27f 100644
--- a/app/pods/protected/users/user-form/template.hbs
+++ b/app/pods/protected/users/user-form/template.hbs
@@ -1,29 +1,29 @@
 <form class="grid-form" {{action 'save' on='submit'}}>
   <fieldset>
-    <legend><em>{{user.name}}</em></legend>
+    <legend><em>{{name}}</em></legend>
     <div data-row-span="1">
       <div data-field-span="1">
         <label>Name</label>
-        {{input value=user.name}}
+        {{one-way-input type="text" class="user-name" value=name update=(action "nameDidChange")}}
       </div>
     </div>
     <div data-row-span="1">
       <div data-field-span="1">
         <label>Email</label>
-        {{input value=user.email}}
+        {{one-way-input type="text" class="email" value=email update=(action "emailDidChange")}}
       </div>
     </div>
     <div data-row-span="1">
       <div data-field-span="1">
         <label>Role</label>
-        {{#if session.currentUser.isAdmin}}
-          <select onchange={{action (mut user.role) value="target.value"}}>
+        {{#if isAdmin}}
+          <select onchange={{action "roleDidChange" value="target.value"}}>
             {{#each roles as |roleChoice|}}
-              <option value={{roleChoice}} selected={{equal user.role roleChoice}}>{{roleChoice}}</option>
+              <option value={{roleChoice}} selected={{equal role roleChoice}}>{{roleChoice}}</option>
             {{/each}}
           </select>
         {{else}}
-          {{user.role}}
+          {{role}} {{!-- Not editable --}}
         {{/if}}
       </div>
     </div>
@@ -32,8 +32,8 @@
   <a class="button-red smaller" {{action 'cancel'}}>
     Cancel
   </a>
-  {{#if user.hasDirtyAttributes}}
-    <button type="submit" class="button-green smaller">
+  {{#if isDirty}}
+    <button type="submit" class="button-green smaller save-user">
       Save
     </button>
   {{/if}}
diff --git a/app/pods/users/lockoutauthenticate/controller.js b/app/pods/users/lockoutauthenticate/controller.js
index 79734b5..4adee77 100644
--- a/app/pods/users/lockoutauthenticate/controller.js
+++ b/app/pods/users/lockoutauthenticate/controller.js
@@ -1,6 +1,8 @@
 import Ember from 'ember';
 
-export default Ember.Controller.extend({
-  queryParams: ['token'],
+const { Controller } = Ember;
 
+export default Controller.extend({
+  queryParams: ['token'],
+  token: null,
 });
diff --git a/app/pods/users/lockoutauthenticate/route.js b/app/pods/users/lockoutauthenticate/route.js
index 8ace7ef..21f807d 100644
--- a/app/pods/users/lockoutauthenticate/route.js
+++ b/app/pods/users/lockoutauthenticate/route.js
@@ -1,14 +1,16 @@
 import Ember from 'ember';
 import UnauthenticatedRouteMixin from 'ember-simple-auth/mixins/unauthenticated-route-mixin';
 
-export default Ember.Route.extend(UnauthenticatedRouteMixin, {
-  session: Ember.inject.service('session'),
-  currentUser: Ember.inject.service('session-account'),
+const { Route, get, inject: { service } } = Ember;
+
+export default Route.extend(UnauthenticatedRouteMixin, {
+  session: service(),
+  currentUser: service('session-account'),
 
   beforeModel: function(transition) {
     this._super(transition);
 
-    let token = Ember.get(transition, 'queryParams.token');
+    const token = get(transition, 'queryParams.token');
     this.get('session').authenticate('authenticator:jwt-resolved', token).then(() => {
       this.get('currentUser.account').then((account) => {
         this.transitionTo('protected.users.changepassword', account.get('id'));
diff --git a/app/pods/users/new/controller.js b/app/pods/users/new/controller.js
index 3285b1a..e2bb0d8 100644
--- a/app/pods/users/new/controller.js
+++ b/app/pods/users/new/controller.js
@@ -1,30 +1,29 @@
 import Ember from 'ember';
 import ajaxError from '../../../utils/ajax-error';
 
-export default Ember.Controller.extend({
-  passwordConfirm: null,
+const { Controller } = Ember;
+
+export default Controller.extend({
+  isLoading: false,
 
   actions: {
-    save: function() {
-      let user = this.get('user');
-
-      // All validation is server-side, except for password verification matching
-      if (user.get('password') !== this.get('passwordConfirm')) {
-        this.get('flashMessages').clearMessages();
-        this.get('flashMessages').error("Password fields don't match");
-        return;
-      }
+    save: function(properties) {
+      const user = this.get('model');
+      user.setProperties(properties);
 
       if (user.get('hasDirtyAttributes')) {
+        this.set('isLoading', true);
         user.save().then(() => {
-          this.transitionTo('login').then(() => {
+          this.transitionToRoute('login').then(() => {
             this.get('flashMessages').information(`You have successfully signed up.
               Please check your email for further instructions.`);
           });
         }, () => {
+          this.set('isLoading', false);
           ajaxError(user.get('errors'), this.get('flashMessages'));
         });
       }
     },
+
   },
 });
diff --git a/app/pods/users/new/new-user-form/component.js b/app/pods/users/new/new-user-form/component.js
new file mode 100644
index 0000000..947080c
--- /dev/null
+++ b/app/pods/users/new/new-user-form/component.js
@@ -0,0 +1,66 @@
+import Ember from 'ember';
+
+const { Component } = Ember;
+
+export default Component.extend({
+  // Read-only attributes
+  user: null,
+  isLoading: null,
+
+  // Actions
+  "on-save": null,
+  "on-cancel": null,
+
+  // Property mapping
+  propertiesList: ['name', 'email', 'password', 'passwordConfirm'],
+  name: null,
+  email: null,
+  password: null,
+  passwordConfirm: null,
+
+  resetOnInit: Ember.on('init', function() {
+    this.get('propertiesList').forEach((field) => {
+      const valueInUser = this.get('user').get(field);
+      this.set(field, valueInUser);
+    });
+  }),
+
+  updateField: function(property, value) {
+    this.set(property, value);
+    // Manually compare against passed in value
+    if (this.get('user').get(property) !== value) {
+      this.set('isDirty', true);
+    } else {
+      this.set('isDirty', false);
+    }
+  },
+
+  actions: {
+    save: function() {
+      // All validation is server-side, except for password verification matching
+      if (this.get('password') !== this.get('passwordConfirm')) {
+        this.get('flashMessages').clearMessages();
+        this.get('flashMessages').error("Password fields don't match");
+        return;
+      }
+
+      return this.attrs['on-save'](this.getProperties(this.get('propertiesList')));
+    },
+
+    nameDidChange: function(value) {
+      this.updateField('name', value);
+    },
+
+    emailDidChange: function(value) {
+      this.updateField('email', value);
+    },
+
+    passwordDidChange: function(value) {
+      this.updateField('password', value);
+    },
+
+    passwordConfirmDidChange: function(value) {
+      this.updateField('passwordConfirm', value);
+    }
+  }
+});
diff --git a/app/pods/users/new/new-user-form/template.hbs b/app/pods/users/new/new-user-form/template.hbs
new file mode 100644
index 0000000..980eec9
--- /dev/null
+++ b/app/pods/users/new/new-user-form/template.hbs
@@ -0,0 +1,36 @@
+{{#if isLoading}}
+  {{loading-panel}}
+{{else}}
+  <div class="grid-1">
+    <div class="span-1">
+      <fieldset>
+        <legend>New User Signup</legend>
+        <form {{action 'save' on='submit'}}>
+          <ul>
+            <li>
+              <label>Name</label>
+              {{one-way-input type="text" class="user-name" value=name update=(action "nameDidChange")}}
+            </li>
+            <li>
+              <label>Email</label>
+              {{one-way-input type="text" class="email" value=email update=(action "emailDidChange")}}
+            </li>
+            <li>
+              <label>Password</label>
+              {{one-way-input type="password" class="password" value=password update=(action "passwordDidChange")}}
+            </li>
+            <li>
+              <label>Password (confirm)</label>
+              {{one-way-input type="password" class="password-verify" value=passwordConfirm update=(action "passwordConfirmDidChange")}}
+            </li>
+            <li>
+              <button type="submit" class="button-green smaller save-user">
+                Submit
+              </button>
+            </li>
+          </ul>
+        </form>
+      </fieldset>
+    </div>
+  </div>
+{{/if}}
diff --git a/app/pods/users/new/route.js b/app/pods/users/new/route.js
index c3e757a..afdcdac 100644
--- a/app/pods/users/new/route.js
+++ b/app/pods/users/new/route.js
@@ -1,15 +1,10 @@
 import Ember from 'ember';
 import UnauthenticatedRouteMixin from 'ember-simple-auth/mixins/unauthenticated-route-mixin';
 
-export default Ember.Route.extend(UnauthenticatedRouteMixin, {
+const { Route } = Ember;
+
+export default Route.extend(UnauthenticatedRouteMixin, {
   model: function() {
-    return Ember.RSVP.hash({
-      user: this.store.createRecord('user'),
-    });
+    return this.store.createRecord('user');
   },
-
-  setupController: function(controller, model) {
-    controller.setProperties(model);
-  },
-
 });
diff --git a/app/pods/users/new/template.hbs b/app/pods/users/new/template.hbs
index d6e81c5..ac728bf 100644
--- a/app/pods/users/new/template.hbs
+++ b/app/pods/users/new/template.hbs
@@ -1,32 +1,6 @@
-<div class="grid-1">
-  <div class="span-1">
-    <fieldset>
-      <legend>New User Signup</legend>
-      <form {{action 'save' on='submit'}}>
-        <ul>
-          <li>
-            <label>Name</label>
-            {{input value=user.name}}
-          </li>
-          <li>
-            <label>Email</label>
-            {{input value=user.email}}
-          </li>
-          <li>
-            <label>Password</label>
-            {{input type="password" value=user.password}}
-          </li>
-          <li>
-            <label>Password (confirm)</label>
-            {{input type="password" value=passwordConfirm}}
-          </li>
-          <li>
-            <button type="submit" class="button-green smaller">
-              Submit
-            </button>
-          </li>
-        </ul>
-      </form>
-    </fieldset>
-  </div>
-</div>
+{{
+  users/new/new-user-form
+  user=model
+  isLoading=isLoading
+  on-save=(action "save")
+}}
diff --git a/app/pods/users/new/verify/route.js b/app/pods/users/new/verify/route.js
index 7c50823..a2d26c2 100644
--- a/app/pods/users/new/verify/route.js
+++ b/app/pods/users/new/verify/route.js
@@ -1,23 +1,15 @@
 import Ember from 'ember';
-import ajaxRequest from '../../../../utils/ajax-request';
 
-export default Ember.Route.extend({
-  session: Ember.inject.service('session'),
+const { Route, inject: { service } } = Ember;
 
-  apiURL: function() {
-    return this.get('globals.apiURL');
-  }.property(),
-
-  genus: function() {
-    return this.get('globals.genus');
-  }.property(),
+export default Route.extend({
+  session: service(),
+  ajax: service(),
 
   model: function(params) {
-    let url = `${this.get('apiURL')}/api/${this.get('genus')}/users/verify/${params.nonce}`;
-    return ajaxRequest(url, {}, this.get('session'));
+    return this.get('ajax').request(`/users/verify/${params.nonce}`);
   },
 
-
   afterModel: function(model/*, transition*/) {
     this.get('flashMessages').success(model.msg);
     this.transitionTo('login');
@@ -25,7 +17,7 @@ export default Ember.Route.extend({
 
   actions: {
     error: function(error/*, transition*/) {
-      let err = Ember.$.parseJSON(error.responseText);
+      const err = Ember.$.parseJSON(error.responseText);
       this.get('flashMessages').error(err.error);
       this.transitionTo('login');
     }
diff --git a/app/pods/users/new/verify/template.hbs b/app/pods/users/new/verify/template.hbs
deleted file mode 100644
index c24cd68..0000000
--- a/app/pods/users/new/verify/template.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{outlet}}
diff --git a/app/pods/users/requestlockouthelp/controller.js b/app/pods/users/requestlockouthelp/controller.js
index ccda273..321045d 100644
--- a/app/pods/users/requestlockouthelp/controller.js
+++ b/app/pods/users/requestlockouthelp/controller.js
@@ -1,17 +1,15 @@
 import Ember from 'ember';
-import ajaxRequest from '../../../utils/ajax-request';
 
-export default Ember.Controller.extend({
-  session: Ember.inject.service('session'),
+const { Controller, inject: { service } } = Ember;
+
+export default Controller.extend({
+  session: service(),
+  globals: service(),
+  ajax: service(),
 
   actions: {
-    save: function() {
-      let url = `${this.get('globals.apiURL')}/api/${this.get('globals.genus')}/users/lockout`;
-      let options = {
-        method: 'POST',
-        data: { email: this.get('email') },
-      };
-      ajaxRequest(url, options, this.get('session'));
+    submit: function(email) {
+      this.get('ajax').post('/users/lockout', { data: { email: email } } );
       this.transitionToRoute('login');
       this.get('flashMessages').information('Please check your email');
     },
diff --git a/app/pods/users/requestlockouthelp/lockout-form/component.js b/app/pods/users/requestlockouthelp/lockout-form/component.js
new file mode 100644
index 0000000..2b7426f
--- /dev/null
+++ b/app/pods/users/requestlockouthelp/lockout-form/component.js
@@ -0,0 +1,18 @@
+import Ember from 'ember';
+
+const { Component } = Ember;
+
+export default Component.extend({
+  email: null,
+  "on-submit": null,
+
+  actions: {
+    save: function() {
+      return this.attrs["on-submit"](this.get('email'));
+    },
+
+    emailDidChange: function(value) {
+      this.set('email', value);
+    },
+  }
+});
diff --git a/app/pods/users/requestlockouthelp/lockout-form/template.hbs b/app/pods/users/requestlockouthelp/lockout-form/template.hbs
new file mode 100644
index 0000000..5f18a09
--- /dev/null
+++ b/app/pods/users/requestlockouthelp/lockout-form/template.hbs
@@ -0,0 +1,18 @@
+<div class="grid-1">
+  <div class="span-1">
+    <fieldset>
+      <legend>Account Lockout/Password Reset</legend>
+      <form {{action 'save' on='submit'}}>
+        <ul>
+          <li>
+            <label>Email</label>
+            {{one-way-input type="text" class="email" value=email update=(action "emailDidChange")}}
+          </li>
+          <li>
+            <button type="submit" class="button-green smaller">Submit</button>
+          </li>
+        </ul>
+      </form>
+    </fieldset>
+  </div>
+</div>
diff --git a/app/pods/users/requestlockouthelp/route.js b/app/pods/users/requestlockouthelp/route.js
deleted file mode 100644
index 19831b4..0000000
--- a/app/pods/users/requestlockouthelp/route.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import Ember from 'ember';
-
-export default Ember.Route.extend({
-  deactivate: function() {
-    this.controller.set('email', null);
-  },
-
-});
diff --git a/app/pods/users/requestlockouthelp/template.hbs b/app/pods/users/requestlockouthelp/template.hbs
index 7cdd25f..c482b70 100644
--- a/app/pods/users/requestlockouthelp/template.hbs
+++ b/app/pods/users/requestlockouthelp/template.hbs
@@ -1,18 +1,4 @@
-<div class="grid-1">
-  <div class="span-1">
-    <fieldset>
-      <legend>Account Lockout/Password Reset</legend>
-      <form {{action 'save' on='submit'}}>
-        <ul>
-          <li>
-            <label>Email</label>
-            {{input value=email}}
-          </li>
-          <li>
-            <button type="submit" class="button-green smaller">Submit</button>
-          </li>
-        </ul>
-      </form>
-    </fieldset>
-  </div>
-</div>
+{{
+  users/requestlockouthelp/lockout-form
+  on-submit=(action "submit")
+}}
diff --git a/app/router.js b/app/router.js
index f5cc4af..13b6c88 100644
--- a/app/router.js
+++ b/app/router.js
@@ -1,7 +1,7 @@
 import Ember from 'ember';
 import config from './config/environment';
 
-var Router = Ember.Router.extend({
+const Router = Ember.Router.extend({
   location: config.locationType
 });
 
diff --git a/app/serializers/application.js b/app/serializers/application.js
index 52f555e..d40a2bf 100644
--- a/app/serializers/application.js
+++ b/app/serializers/application.js
@@ -1,19 +1,22 @@
 import DS from 'ember-data';
 import Ember from 'ember';
 
-export default DS.RESTSerializer.extend({
+const { RESTSerializer } = DS;
+const { isNone } = Ember;
+
+export default RESTSerializer.extend({
   isNewSerializerAPI: true,
 
   serializeBelongsTo: function(snapshot, json, relationship) {
-    var key = relationship.key;
-    var belongsTo = snapshot.belongsTo(key);
+    let key = relationship.key;
+    const belongsTo = snapshot.belongsTo(key);
     key = this.keyForRelationship ? this.keyForRelationship(key, "belongsTo", "serialize") : key;
-    json[key] = Ember.isNone(belongsTo) ? belongsTo : +belongsTo.record.id;
+    json[key] = isNone(belongsTo) ? belongsTo : +belongsTo.record.id;
   },
 
   serializeHasMany: function(snapshot, json, relationship) {
-    var key = relationship.key;
-    var hasMany = snapshot.hasMany(key);
+    let key = relationship.key;
+    const hasMany = snapshot.hasMany(key);
     key = this.keyForRelationship ? this.keyForRelationship(key, "hasMany", "serialize") : key;
 
     json[key] = [];
diff --git a/app/services/ajax.js b/app/services/ajax.js
new file mode 100644
index 0000000..a0a8cef
--- /dev/null
+++ b/app/services/ajax.js
@@ -0,0 +1,23 @@
+import Ember from 'ember';
+import AjaxService from 'ember-ajax/services/ajax';
+
+const { computed, inject: { service } } = Ember;
+
+export default AjaxService.extend({
+  session: service(),
+  globals: service(),
+
+  host: computed('globals.apiURL', function() {
+    return `${this.get('globals.apiURL')}/api/${this.get('globals.genus')}`;
+  }),
+
+  headers: computed('session.authToken', {
+    get: function() {
+      let headers = {};
+      this.get('session').authorize('authorizer:application', (headerName, headerValue) => {
+        headers[headerName] = headerValue;
+      });
+      return headers;
+    }
+  })
+});
diff --git a/app/services/session-account.js b/app/services/session-account.js
index 1b34554..ee09f3a 100644
--- a/app/services/session-account.js
+++ b/app/services/session-account.js
@@ -2,19 +2,20 @@ import Ember from 'ember';
 import DS from 'ember-data';
 import parseBase64 from '../utils/parse-base64';
 
-const { service } = Ember.inject;
+const { Service, computed, isEmpty, inject: { service } } = Ember;
+const { PromiseObject } = DS;
 
-export default Ember.Service.extend({
+export default Service.extend({
   session: service('session'),
   store: service(),
 
-  account: Ember.computed('session.data.authenticated.access_token', function() {
+  account: computed('session.data.authenticated.access_token', function() {
     const token = this.get('session.data.authenticated.access_token');
     const claims = parseBase64(token);
     const id = claims['sub'];
 
-    if (!Ember.isEmpty(id)) {
-      return DS.PromiseObject.create({
+    if (!isEmpty(id)) {
+      return PromiseObject.create({
         promise: this.get('store').findRecord('user', id),
       });
     }
diff --git a/app/utils/ajax-request.js b/app/utils/ajax-request.js
deleted file mode 100644
index a4c8de9..0000000
--- a/app/utils/ajax-request.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import Ember from 'ember';
-
-export default function ajaxRequest(url, options, session) {
-  return new Ember.RSVP.Promise(function(resolve, reject) {
-    options = options || {};
-    options.url = url;
-    session.authorize('authorizer:application', (headerName, headerValue) => {
-      let authHeader = {};
-      authHeader[headerName] = headerValue;
-      options.headers = authHeader;
-    });
-    options.success = function(data) {
-      resolve(data);
-    };
-    options.error = function(jqXHR, status, error) {
-      reject(jqXHR, status, error);
-    };
-    Ember.$.ajax(options);
-  });
-}
diff --git a/bower.json b/bower.json
index 049bb7d..a72a8e1 100644
--- a/bower.json
+++ b/bower.json
@@ -3,15 +3,15 @@
   "dependencies": {
     "jquery": "~2.1.1",
     "ember": "1.13.10",
-    "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
-    "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
-    "ember-data": "1.13.13",
-    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
-    "ember-qunit": "0.4.9",
-    "ember-qunit-notifications": "0.0.7",
-    "ember-resolver": "~0.1.18",
+    "ember-cli-shims": "0.0.6",
+    "ember-cli-test-loader": "0.2.1",
+    "ember-data": "1.13.15",
+    "ember-load-initializers": "0.1.7",
+    "ember-qunit": "0.4.16",
+    "ember-qunit-notifications": "0.1.0",
+    "ember-resolver": "~0.1.20",
     "loader.js": "ember-cli/loader.js#3.2.1",
-    "qunit": "~1.18.0",
+    "qunit": "~1.20.0",
     "flakes": "~1.0.0",
     "moment": "~2.10.6",
     "select2": "3.5.2",
diff --git a/config/environment.js b/config/environment.js
index 07a3c1f..3caf430 100644
--- a/config/environment.js
+++ b/config/environment.js
@@ -24,6 +24,15 @@ module.exports = function(environment) {
       routeAfterAuthentication: 'protected.compare',
       routeIfAlreadyAuthenticated: 'protected.compare',
     },
+    contentSecurityPolicy: {
+      'default-src': "'none'",
+      'script-src': "'self'",
+      'font-src': "'self'",
+      'connect-src': "'self'",
+      'img-src': "'self'",
+      'style-src': "'self' 'unsafe-inline'",
+      'media-src': "'self'"
+    }
   };
 
   var apiURL;
@@ -37,6 +46,8 @@ module.exports = function(environment) {
     ENV.APP.LOG_ACTIVE_GENERATION = false;
     ENV.APP.LOG_VIEW_LOOKUPS = false;
     ENV.locationType = 'none';
+    ENV.baseURL = '/';
+    ENV.APP.rootElement = '#ember-testing';
   }
 
   if (environment === 'staging') {
@@ -50,6 +61,7 @@ module.exports = function(environment) {
   }
 
   ENV.apiURL = apiURL;
+  ENV.contentSecurityPolicy['connect-src'] = `'self' ${apiURL}`;
 
   return ENV;
 };
diff --git a/ember-cli-build.js b/ember-cli-build.js
index 995161c..3ae8de0 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -1,3 +1,4 @@
+/*jshint node:true*/
 /* global require, module */
 var EmberApp = require('ember-cli/lib/broccoli/ember-app');
 
diff --git a/package.json b/package.json
index aa8d31c..9347f07 100644
--- a/package.json
+++ b/package.json
@@ -19,25 +19,25 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "broccoli-asset-rev": "^2.1.2",
-    "ember-cli": "1.13.8",
-    "ember-cli-app-version": "0.5.0",
-    "ember-cli-babel": "^5.1.3",
-    "ember-cli-dependency-checker": "^1.0.1",
-    "ember-cli-divshot": "^0.1.7",
+    "broccoli-asset-rev": "^2.2.0",
+    "ember-cli": "1.13.11",
+    "ember-cli-app-version": "^1.0.0",
+    "ember-cli-babel": "^5.1.5",
+    "ember-cli-content-security-policy": "0.4.0",
+    "ember-cli-dependency-checker": "^1.1.0",
     "ember-cli-flash": "1.3.6",
-    "ember-cli-htmlbars": "0.7.9",
-    "ember-cli-htmlbars-inline-precompile": "^0.2.0",
-    "ember-cli-ic-ajax": "0.2.1",
+    "ember-cli-htmlbars": "^1.0.1",
+    "ember-cli-htmlbars-inline-precompile": "^0.3.1",
+    "ember-ajax": "0.7.0",
     "ember-cli-inject-live-reload": "^1.3.1",
     "ember-cli-mirage": "0.1.11",
-    "ember-cli-qunit": "^1.0.0",
-    "ember-cli-release": "0.2.3",
-    "ember-cli-sri": "^1.0.3",
+    "ember-cli-qunit": "^1.0.4",
+    "ember-cli-release": "0.2.8",
+    "ember-cli-sri": "^1.1.0",
     "ember-cli-uglify": "^1.2.0",
-    "ember-data": "1.13.13",
-    "ember-disable-proxy-controllers": "^1.0.0",
-    "ember-export-application-global": "^1.0.3",
+    "ember-data": "1.13.15",
+    "ember-disable-proxy-controllers": "^1.0.1",
+    "ember-export-application-global": "^1.0.4",
     "ember-one-way-input": "0.1.3",
     "ember-select-2": "1.3.0",
     "ember-simple-auth": "1.0.0"
diff --git a/tests/acceptance/strains-test.js b/tests/acceptance/strains-test.js
new file mode 100644
index 0000000..a52e7ed
--- /dev/null
+++ b/tests/acceptance/strains-test.js
@@ -0,0 +1,76 @@
+import Ember from 'ember';
+import { module, test } from 'qunit';
+import startApp from '../helpers/start-app';
+import { authenticateSession } from '../helpers/ember-simple-auth';
+
+module('Acceptance | strains', {
+  beforeEach: function() {
+    this.application = startApp();
+    authenticateSession(this.application, {
+      access_token: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJiYWN0ZGIiLCJzdWIiOiIxIiwiZXhwIjoxNDQ2NTAyMjI2LCJpYXQiOjE0NDY0OTg2MjZ9.vIjKHAsp2TkCV505EbtCo2xQT-2oQkB-Nv5y0b6E7Mg"
+    });
+    server.create('users', { role: 'A', canEdit: true });
+  },
+
+  afterEach: function() {
+    Ember.run(this.application, 'destroy');
+  }
+});
+
+test('visiting /strains', function(assert) {
+  const species = server.create('species');
+  const strains = server.createList('strains', 20, { species: species.id });
+  visit('/strains');
+
+  andThen(function() {
+    assert.equal(currentURL(), '/strains');
+    assert.equal(find(".flakes-table > tbody > tr").length, strains.length);
+    assert.equal(find("#total-strains").text(), "Total strains: 20");
+  });
+});
+
+test('visiting /strains/:id', function(assert) {
+  const species = server.create('species');
+  const strain = server.create('strains', { species: species.id });
+  visit(`/strains/${strain.id}`);
+
+  andThen(function() {
+    assert.equal(currentURL(), `/strains/${strain.id}`);
+    const typeStrain = strain.typeStrain ? 'T' : '';
+    assert.equal(find(".flakes-information-box > legend").text().trim(), `${strain.strainName}${typeStrain}`);
+  });
+});
+
+test('editing /strains/:id/edit', function(assert) {
+  const species = server.create('species');
+  const strain = server.create('strains', { canEdit: true , species: species.id });
+  visit(`/strains/${strain.id}/edit`);
+
+  andThen(function() {
+    assert.equal(currentURL(), `/strains/${strain.id}/edit`);
+
+    fillIn('.strain-name', 'Revised Strain Name');
+    click('.save-strain');
+
+    andThen(function() {
+      assert.equal(currentURL(), `/strains/${strain.id}`);
+      const typeStrain = strain.typeStrain ? 'T' : '';
+      assert.equal(find(".flakes-information-box > legend").text().trim(), `Revised Strain Name${typeStrain}`);
+    });
+  });
+});
+
+test('creating /strains/new', function(assert) {
+  visit(`/strains/new`);
+
+  andThen(function() {
+    assert.equal(currentURL(), `/strains/new`);
+    fillIn('.strain-name', 'New Strain Name');
+    click('.save-strain');
+
+    andThen(function() {
+      assert.equal(find(".flakes-information-box > legend").text().trim(), `New Strain Name`);
+      assert.equal(server.db.strains.length, 1);
+    });
+  });
+});
diff --git a/tests/acceptance/users-test.js b/tests/acceptance/users-test.js
new file mode 100644
index 0000000..ed08d72
--- /dev/null
+++ b/tests/acceptance/users-test.js
@@ -0,0 +1,77 @@
+import Ember from 'ember';
+import { module, test } from 'qunit';
+import startApp from '../helpers/start-app';
+import { invalidateSession, authenticateSession } from '../helpers/ember-simple-auth';
+
+module('Acceptance | users', {
+  beforeEach: function() {
+    this.application = startApp();
+    authenticateSession(this.application, {
+      access_token: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJiYWN0ZGIiLCJzdWIiOiIxIiwiZXhwIjoxNDQ2NTAyMjI2LCJpYXQiOjE0NDY0OTg2MjZ9.vIjKHAsp2TkCV505EbtCo2xQT-2oQkB-Nv5y0b6E7Mg"
+    });
+    server.create('users', { role: 'A', canEdit: true });
+  },
+
+  afterEach: function() {
+    Ember.run(this.application, 'destroy');
+  }
+});
+
+test('visiting /users', function(assert) {
+  const users = server.createList('users', 19); // We already created one user in beforeEach
+  visit('/users');
+
+  andThen(function() {
+    assert.equal(currentURL(), '/users');
+    assert.equal(find(".flakes-table > tbody > tr").length, users.length + 1);
+    assert.equal(find("#total-users").text(), "Total users: 20");
+  });
+});
+
+
+test('visiting /users/:id', function(assert) {
+  const user = server.create('users');
+  visit(`/users/${user.id}`);
+
+  andThen(function() {
+    assert.equal(currentURL(), `/users/${user.id}`);
+    assert.equal(find(".flakes-information-box > legend").text().trim(), user.name);
+  });
+});
+
+test('editing /users/:id/edit', function(assert) {
+  const user = server.create('users', { 'canEdit': true });
+  visit(`/users/${user.id}/edit`);
+
+  andThen(function() {
+    assert.equal(currentURL(), `/users/${user.id}/edit`);
+
+    fillIn('.user-name', 'Revised User Name');
+    click('.save-user');
+
+    andThen(function() {
+      assert.equal(currentURL(), `/users/${user.id}`);
+      assert.equal(find(".flakes-information-box > legend").text().trim(), 'Revised User Name');
+    });
+  });
+});
+
+test('creating /users/new', function(assert) {
+  invalidateSession(this.application);
+  visit(`/users/new`);
+
+  andThen(function() {
+    assert.equal(currentURL(), `/users/new`);
+    fillIn('.user-name', 'New User Name');
+    fillIn('.email', 'example@example.com');
+    fillIn('.password', 'Password1');
+    fillIn('.password-verify', 'Password1');
+    click('.save-user');
+
+    andThen(function() {
+      assert.equal(currentURL(), `/login`);
+      assert.equal(find(".flakes-message").text().trim(), `✖ You have successfully signed up.
+              Please check your email for further instructions.`);
+    });
+  });
+});
diff --git a/tests/helpers/destroy-app.js b/tests/helpers/destroy-app.js
new file mode 100644
index 0000000..c3d4d1a
--- /dev/null
+++ b/tests/helpers/destroy-app.js
@@ -0,0 +1,5 @@
+import Ember from 'ember';
+
+export default function destroyApp(application) {
+  Ember.run(application, 'destroy');
+}
diff --git a/tests/helpers/module-for-acceptance.js b/tests/helpers/module-for-acceptance.js
new file mode 100644
index 0000000..ed23003
--- /dev/null
+++ b/tests/helpers/module-for-acceptance.js
@@ -0,0 +1,23 @@
+import { module } from 'qunit';
+import startApp from '../helpers/start-app';
+import destroyApp from '../helpers/destroy-app';
+
+export default function(name, options = {}) {
+  module(name, {
+    beforeEach() {
+      this.application = startApp();
+
+      if (options.beforeEach) {
+        options.beforeEach.apply(this, arguments);
+      }
+    },
+
+    afterEach() {
+      destroyApp(this.application);
+
+      if (options.afterEach) {
+        options.afterEach.apply(this, arguments);
+      }
+    }
+  });
+}
diff --git a/tests/helpers/resolver.js b/tests/helpers/resolver.js
index 28f4ece..ebfb4e4 100644
--- a/tests/helpers/resolver.js
+++ b/tests/helpers/resolver.js
@@ -1,7 +1,7 @@
 import Resolver from 'ember/resolver';
 import config from '../../config/environment';
 
-var resolver = Resolver.create();
+const resolver = Resolver.create();
 
 resolver.namespace = {
   modulePrefix: config.modulePrefix,
diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
index 0f7aab1..e098f1d 100644
--- a/tests/helpers/start-app.js
+++ b/tests/helpers/start-app.js
@@ -3,12 +3,12 @@ import Application from '../../app';
 import config from '../../config/environment';
 
 export default function startApp(attrs) {
-  var application;
+  let application;
 
-  var attributes = Ember.merge({}, config.APP);
+  let attributes = Ember.merge({}, config.APP);
   attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
 
-  Ember.run(function() {
+  Ember.run(() => {
     application = Application.create(attributes);
     application.setupForTesting();
     application.injectTestHelpers();
diff --git a/tests/index.html b/tests/index.html
index e32fd45..20f5400 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -18,13 +18,14 @@
     {{content-for 'test-head-footer'}}
   </head>
   <body>
-
     {{content-for 'body'}}
     {{content-for 'test-body'}}
+
     <script src="assets/vendor.js"></script>
     <script src="assets/test-support.js"></script>
     <script src="assets/clostridiumdotinfo.js"></script>
-    <script src="testem.js"></script>
+    <script src="testem.js" integrity=""></script>
+    <script src="assets/tests.js"></script>
     <script src="assets/test-loader.js"></script>
 
     {{content-for 'body-footer'}}
diff --git a/tests/unit/initializers/component-store-test.js b/tests/unit/initializers/component-store-test.js
deleted file mode 100644
index b0429e5..0000000
--- a/tests/unit/initializers/component-store-test.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import Ember from 'ember';
-import { initialize } from '../../../initializers/component-store';
-import { module, test } from 'qunit';
-
-var container, application;
-
-module('Unit | Initializer | component store', {
-  beforeEach: function() {
-    Ember.run(function() {
-      application = Ember.Application.create();
-      container = application.__container__;
-      application.deferReadiness();
-    });
-  }
-});
-
-// Replace this with your real tests.
-test('it works', function(assert) {
-  initialize(container, application);
-
-  // you would normally confirm the results of the initializer here
-  assert.ok(true);
-});