diff --git a/app/mirage/config.js b/app/mirage/config.js
index 79cee5e..929ea8a 100644
--- a/app/mirage/config.js
+++ b/app/mirage/config.js
@@ -16,4 +16,9 @@ export function testConfig() {
   this.post('/species');
   this.get('/species/:id');
   this.put('/species/:id');
+
+  this.get('/characteristics');
+  this.post('/characteristics');
+  this.get('/characteristics/:id');
+  this.put('/characteristics/:id');
 }
diff --git a/app/mirage/factories/characteristics.js b/app/mirage/factories/characteristics.js
new file mode 100644
index 0000000..5999c50
--- /dev/null
+++ b/app/mirage/factories/characteristics.js
@@ -0,0 +1,10 @@
+import Mirage, { faker } from 'ember-cli-mirage';
+
+export default Mirage.Factory.extend({
+  characteristicName() { return faker.lorem.words().join(' '); },
+  characteristicTypeName() { return faker.lorem.words().join(' '); },
+  strains: [],
+  measurements: [],
+  sortOrder: faker.random.number(),
+  canEdit: faker.random.boolean(),
+});
diff --git a/app/mixins/save-model.js b/app/mixins/save-model.js
index 97cc97b..53efda9 100644
--- a/app/mixins/save-model.js
+++ b/app/mixins/save-model.js
@@ -4,12 +4,13 @@ import ajaxError from '../utils/ajax-error';
 const { Mixin } = Ember;
 
 export default Mixin.create({
-  fallbackRoute: null,
+  fallbackRouteSave: null,
+  fallbackRouteCancel: null,
 
   actions: {
     save: function(properties) {
       const model = this.get('model');
-      const fallbackRoute = this.get('fallbackRoute');
+      const fallbackRoute = this.get('fallbackRouteSave');
 
       model.setProperties(properties);
 
@@ -30,7 +31,7 @@ export default Mixin.create({
       model.get('errors').clear();
       model.rollbackAttributes();
 
-      this.transitionToRoute(this.get('fallbackRoute'), model);
+      this.transitionToRoute(this.get('fallbackRouteCancel'), model);
     },
   },
 });
diff --git a/app/mixins/setup-metadata.js b/app/mixins/setup-metadata.js
new file mode 100644
index 0000000..183f93f
--- /dev/null
+++ b/app/mixins/setup-metadata.js
@@ -0,0 +1,14 @@
+import Ember from 'ember';
+
+const { Mixin, inject: { service }} = Ember;
+
+export default Mixin.create({
+  currentUser: service('session-account'),
+  metaData: null,
+
+  setupMetaDataOnInit: Ember.on('init', function() {
+    this.get('currentUser.account').then((user) => {
+      this.set('metaData', user.get('metaData'));
+    });
+  }),
+});
diff --git a/app/pods/protected/characteristics/characteristic-form/component.js b/app/pods/protected/characteristics/characteristic-form/component.js
index a53a469..f82a8ca 100644
--- a/app/pods/protected/characteristics/characteristic-form/component.js
+++ b/app/pods/protected/characteristics/characteristic-form/component.js
@@ -1,13 +1,60 @@
 import Ember from 'ember';
+import SetupMetaData from '../../../../mixins/setup-metadata';
+
+const { Component } = Ember;
+
+export default Component.extend(SetupMetaData, {
+  // Read-only attributes
+  characteristic: null,
+  isDirty: false,
+
+  // Actions
+  "on-save": null,
+  "on-cancel": null,
+  "on-update": null,
+
+  // Property mapping
+  propertiesList: ['characteristicName', 'characteristicTypeName', 'sortOrder'],
+  characteristicName: null,
+  characteristicTypeName: null,
+  sortOrder: null,
+
+  resetOnInit: Ember.on('init', function() {
+    this.get('propertiesList').forEach((field) => {
+      const valueInCharacteristic = this.get('characteristic').get(field);
+      this.set(field, valueInCharacteristic);
+    });
+  }),
+
+  updateField: function(property, value) {
+    this.set(property, value);
+    // Manually compare against passed in value
+    if (this.get('characteristic').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']();
     },
-  }
+
+    characteristicNameDidChange: function(value) {
+      this.updateField('characteristicName', value);
+    },
+
+    characteristicTypeNameDidChange: function(value) {
+      this.updateField('characteristicTypeName', value);
+    },
+
+    sortOrderDidChange: function(value) {
+      this.updateField('sortOrder', value);
+    },
+  },
 });
diff --git a/app/pods/protected/characteristics/characteristic-form/template.hbs b/app/pods/protected/characteristics/characteristic-form/template.hbs
index b1d68c0..ea89522 100644
--- a/app/pods/protected/characteristics/characteristic-form/template.hbs
+++ b/app/pods/protected/characteristics/characteristic-form/template.hbs
@@ -1,20 +1,20 @@
 <form class="grid-form" {{action 'save' on='submit'}}>
   <fieldset>
-    <legend><em>{{characteristic.characteristicName}}</em></legend>
+    <legend><em>{{characteristicName}}</em></legend>
     <div data-row-span="1">
       <div data-field-span="1">
         <label>Characteristic Name</label>
-        {{input value=characteristic.characteristicName}}
+        {{one-way-input type="text" class="characteristic-name" value=characteristicName update=(action "characteristicNameDidChange")}}
       </div>
     </div>
     <div data-row-span="2">
       <div data-field-span="1">
         <label>Characteristic Type</label>
-        {{input value=characteristic.characteristicTypeName}}
+        {{one-way-input type="text" class="characteristic-type-name" value=characteristicTypeName update=(action "characteristicTypeNameDidChange")}}
       </div>
       <div data-field-span="1">
         <label>Sort Order</label>
-        {{input value=characteristic.sortOrder}}
+        {{one-way-input type="text" class="sort-order" value=sortOrder update=(action "sortOrderDidChange")}}
       </div>
     </div>
   </fieldset>
@@ -22,8 +22,8 @@
   <a class="button-red smaller" {{action 'cancel'}}>
     Cancel
   </a>
-  {{#if characteristic.hasDirtyAttributes}}
-    <button type="submit" class="button-green smaller">
+  {{#if isDirty}}
+    <button type="submit" class="button-green smaller save-characteristic">
       Save
     </button>
   {{/if}}
diff --git a/app/pods/protected/characteristics/edit/controller.js b/app/pods/protected/characteristics/edit/controller.js
index 3c8ecf2..0b83924 100644
--- a/app/pods/protected/characteristics/edit/controller.js
+++ b/app/pods/protected/characteristics/edit/controller.js
@@ -1,32 +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 characteristic = this.get('model');
+const { Controller } = Ember;
 
-      if (characteristic.get('hasDirtyAttributes')) {
-        characteristic.save().then((characteristic) => {
-          this.transitionToRoute('protected.characteristics.show', characteristic);
-        }, () => {
-          ajaxError(characteristic.get('errors'), this.get('flashMessages'));
-        });
-      } else {
-        characteristic.destroyRecord().then(() => {
-          this.transitionToRoute('protected.characteristics.show', characteristic);
-        });
-      }
-    },
-
-    cancel: function() {
-      let characteristic = this.get('model');
-
-      characteristic.get('errors').clear();
-      characteristic.rollbackAttributes();
-
-      this.transitionToRoute('protected.characteristics.show', characteristic);
-    },
-
-  },
+export default Controller.extend(SaveModel, {
+  // Required for SaveModel mixin
+  fallbackRouteSave: 'protected.characteristics.show',
+  fallbackRouteCancel: 'protected.characteristics.index',
 });
diff --git a/app/pods/protected/characteristics/edit/route.js b/app/pods/protected/characteristics/edit/route.js
index 3f35133..36f8dab 100644
--- a/app/pods/protected/characteristics/edit/route.js
+++ b/app/pods/protected/characteristics/edit/route.js
@@ -1,25 +1,15 @@
 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.characteristics.index');
-      }
-    });
-  },
+export default Route.extend(ElevatedAccess, {
+  // Required for ElevatedAccess mixin
+  fallbackRouteBefore: 'protected.characteristics.index',
+  fallbackRouteAfter: 'protected.characteristics.show',
 
   model: function(params) {
-    return this.store.findRecord('characteristic', params.characteristic_id, { reload: true });
-  },
-
-  afterModel: function(model) {
-    if (!model.get('canEdit')) {
-      this.transitionTo('characteristics.show', model.get('id'));
-    }
+    return this.store.findRecord('characteristic', params.characteristic_id);
   },
 
 });
diff --git a/app/pods/protected/characteristics/edit/template.hbs b/app/pods/protected/characteristics/edit/template.hbs
index 3f1fe65..f91ed1c 100644
--- a/app/pods/protected/characteristics/edit/template.hbs
+++ b/app/pods/protected/characteristics/edit/template.hbs
@@ -1,6 +1,6 @@
 {{
   protected/characteristics/characteristic-form
   characteristic=model
-  save="save"
-  cancel="cancel"
+  on-save=(action "save")
+  on-cancel=(action "cancel")
 }}
diff --git a/app/pods/protected/characteristics/index/characteristics-table/component.js b/app/pods/protected/characteristics/index/characteristics-table/component.js
new file mode 100644
index 0000000..eea4c8a
--- /dev/null
+++ b/app/pods/protected/characteristics/index/characteristics-table/component.js
@@ -0,0 +1,12 @@
+import Ember from 'ember';
+import SetupMetaData from '../../../../../mixins/setup-metadata';
+
+const { Component } = Ember;
+
+export default Component.extend(SetupMetaData, {
+  characteristics: null,
+
+  sortParams: ['characteristicTypeName', 'sortOrder', 'characteristicName'],
+  sortedCharacteristics: Ember.computed.sort('characteristics', 'sortParams'),
+
+});
diff --git a/app/pods/protected/characteristics/index/characteristics-table/template.hbs b/app/pods/protected/characteristics/index/characteristics-table/template.hbs
new file mode 100644
index 0000000..200e2ef
--- /dev/null
+++ b/app/pods/protected/characteristics/index/characteristics-table/template.hbs
@@ -0,0 +1,26 @@
+<h3 id="total-characteristics">Total characteristics: {{characteristics.length}}</h3>
+
+{{add-button label="Add Characteristic" link="protected.characteristics.new" canAdd=metaData.canAdd}}
+
+<table class="flakes-table">
+  <thead>
+    <tr>
+      <th>Name</th>
+      <th>Type</th>
+      <th>Sort Order</th>
+    </tr>
+  </thead>
+  <tbody>
+    {{#each sortedCharacteristics as |row|}}
+      <tr>
+        <td>
+          {{#link-to 'protected.characteristics.show' row}}
+            {{row.characteristicName}}
+          {{/link-to}}
+        </td>
+        <td>{{row.characteristicTypeName}}</td>
+        <td>{{row.sortOrder}}</td>
+      </tr>
+    {{/each}}
+  </tbody>
+</table>
diff --git a/app/pods/protected/characteristics/index/controller.js b/app/pods/protected/characteristics/index/controller.js
deleted file mode 100644
index 0403cc5..0000000
--- a/app/pods/protected/characteristics/index/controller.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import Ember from 'ember';
-
-export default Ember.Controller.extend({
-  sortParams: ['characteristicTypeName', 'sortOrder', 'characteristicName'],
-  sortedCharacteristics: Ember.computed.sort('model', 'sortParams'),
-});
diff --git a/app/pods/protected/characteristics/index/route.js b/app/pods/protected/characteristics/index/route.js
index 3ee78f4..283f54c 100644
--- a/app/pods/protected/characteristics/index/route.js
+++ b/app/pods/protected/characteristics/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('characteristic');
   },
 
-  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/characteristics/index/template.hbs b/app/pods/protected/characteristics/index/template.hbs
index 3430386..ddf9691 100644
--- a/app/pods/protected/characteristics/index/template.hbs
+++ b/app/pods/protected/characteristics/index/template.hbs
@@ -1,27 +1,6 @@
 <h2>{{genus-name}} Characteristics</h2>
-<h3>Total characteristics: {{model.length}}</h3>
 
-{{add-button label="Add Characteristic" link="protected.characteristics.new" canAdd=metaData.canAdd}}
-
-<table class="flakes-table">
-  <thead>
-    <tr>
-      <th>Name</th>
-      <th>Type</th>
-      <th>Sort Order</th>
-    </tr>
-  </thead>
-  <tbody>
-    {{#each sortedCharacteristics as |row|}}
-      <tr>
-        <td>
-          {{#link-to 'protected.characteristics.show' row}}
-            {{row.characteristicName}}
-          {{/link-to}}
-        </td>
-        <td>{{row.characteristicTypeName}}</td>
-        <td>{{row.sortOrder}}</td>
-      </tr>
-    {{/each}}
-  </tbody>
-</table>
+{{
+  protected/characteristics/index/characteristics-table
+  characteristics=model
+}}
diff --git a/app/pods/protected/characteristics/new/controller.js b/app/pods/protected/characteristics/new/controller.js
index 1d9eef6..0b83924 100644
--- a/app/pods/protected/characteristics/new/controller.js
+++ b/app/pods/protected/characteristics/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 characteristic = this.get('model');
+const { Controller } = Ember;
 
-      if (characteristic.get('hasDirtyAttributes')) {
-        characteristic.save().then((characteristic) => {
-          this.transitionToRoute('protected.characteristics.show', characteristic);
-        }, () => {
-          ajaxError(characteristic.get('errors'), this.get('flashMessages'));
-        });
-      } else {
-        characteristic.destroyRecord().then(() => {
-          this.transitionToRoute('protected.characteristics.index');
-        });
-      }
-    },
-
-    cancel: function() {
-      this.get('model').destroyRecord().then(() => {
-        this.transitionToRoute('protected.characteristics.index');
-      });
-    },
-
-  },
+export default Controller.extend(SaveModel, {
+  // Required for SaveModel mixin
+  fallbackRouteSave: 'protected.characteristics.show',
+  fallbackRouteCancel: 'protected.characteristics.index',
 });
diff --git a/app/pods/protected/characteristics/new/route.js b/app/pods/protected/characteristics/new/route.js
index 34165dd..c287cf9 100644
--- a/app/pods/protected/characteristics/new/route.js
+++ b/app/pods/protected/characteristics/new/route.js
@@ -1,30 +1,14 @@
 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.characteristics.index');
-      }
-    });
-  },
+export default Route.extend(ElevatedAccess, {
+  // Required for ElevatedAccess mixin
+  fallbackRouteBefore: 'protected.characteristics.index',
+  fallbackRouteAfter: 'protected.characteristics.show',
 
   model: function() {
     return this.store.createRecord('characteristic');
   },
-
-  actions: {
-    willTransition: function(/*transition*/) {
-      const controller = this.get('controller');
-      const characteristic = controller.get('model');
-
-      if (characteristic.get('isNew')) {
-        characteristic.destroyRecord();
-      }
-    },
-  },
-
 });
diff --git a/app/pods/protected/characteristics/new/template.hbs b/app/pods/protected/characteristics/new/template.hbs
index 3f1fe65..f91ed1c 100644
--- a/app/pods/protected/characteristics/new/template.hbs
+++ b/app/pods/protected/characteristics/new/template.hbs
@@ -1,6 +1,6 @@
 {{
   protected/characteristics/characteristic-form
   characteristic=model
-  save="save"
-  cancel="cancel"
+  on-save=(action "save")
+  on-cancel=(action "cancel")
 }}
diff --git a/app/pods/protected/characteristics/show/characteristic-card/component.js b/app/pods/protected/characteristics/show/characteristic-card/component.js
new file mode 100644
index 0000000..9f24911
--- /dev/null
+++ b/app/pods/protected/characteristics/show/characteristic-card/component.js
@@ -0,0 +1,14 @@
+import Ember from 'ember';
+
+const { Component } = Ember;
+
+export default Component.extend({
+  characteristic: null,
+  "on-delete": null,
+
+  actions: {
+    deleteCharacteristic: function() {
+      return this.attrs['on-delete']();
+    },
+  },
+});
diff --git a/app/pods/protected/characteristics/show/characteristic-card/template.hbs b/app/pods/protected/characteristics/show/characteristic-card/template.hbs
new file mode 100644
index 0000000..e404106
--- /dev/null
+++ b/app/pods/protected/characteristics/show/characteristic-card/template.hbs
@@ -0,0 +1,55 @@
+<div class="grid-1">
+  <div class="span-1">
+    <fieldset class="flakes-information-box">
+      <legend>
+        {{characteristic.characteristicName}}
+      </legend>
+
+      {{! ROW 1 }}
+      <div class="grid-2 gutter-20">
+        <dl class="span-1">
+          <dt>Characteristic Type</dt>
+          <dd>
+            {{characteristic.characteristicTypeName}}
+          </dd>
+        </dl>
+        <dl class="span-1">
+          <dt>Sort Order</dt>
+          <dd>
+            {{characteristic.sortOrder}}
+          </dd>
+        </dl>
+      </div>
+
+      {{! ROW 2 }}
+      <div class="grid-2 gutter-20">
+        <dl class="span-2">
+          <dt>Measurements</dt>
+          <dd>
+            <p>To add/edit/remove a measurement, please visit the strain's page (links below)</p>
+            {{protected/characteristics/show/measurements-table characteristic=characteristic}}
+          </dd>
+        </dl>
+      </div>
+
+      {{! ROW 3 }}
+      <div class="grid-2 gutter-20">
+        <dl class="span-1">
+          <dt>Record Created</dt>
+          <dd>{{null-time characteristic.createdAt 'LL'}}</dd>
+        </dl>
+        <dl class="span-1">
+          <dt>Record Updated</dt>
+          <dd>{{null-time characteristic.updatedAt 'LL'}}</dd>
+        </dl>
+      </div>
+    </fieldset>
+  </div>
+</div>
+{{#if characteristic.canEdit}}
+  <br>
+  {{#link-to 'protected.characteristics.edit' characteristic.id class="button-gray smaller"}}
+    Edit
+  {{/link-to}}
+  {{delete-button delete=(action 'deleteCharacteristic')}}
+{{/if}}
diff --git a/app/pods/protected/characteristics/show/controller.js b/app/pods/protected/characteristics/show/controller.js
index 044b783..1a9315c 100644
--- a/app/pods/protected/characteristics/show/controller.js
+++ b/app/pods/protected/characteristics/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.characteristics.index');
-      });
-    },
-  },
+const { Controller } = Ember;
 
+export default Controller.extend(DeleteModel, {
+  // Required for DeleteModel mixin
+  transitionRoute: 'protected.characteristics.index',
 });
diff --git a/app/pods/protected/characteristics/show/measurements-table/component.js b/app/pods/protected/characteristics/show/measurements-table/component.js
index 1ca9d17..96b79fc 100644
--- a/app/pods/protected/characteristics/show/measurements-table/component.js
+++ b/app/pods/protected/characteristics/show/measurements-table/component.js
@@ -1,19 +1,24 @@
 import Ember from 'ember';
 
-export default Ember.Component.extend({
-  measurementsPresent: function() {
-    return this.get('model.measurements.length') > 0;
-  }.property('model.measurements'),
+const { Component, computed } = Ember;
+const { sort } = computed;
+
+export default Component.extend({
+  characteristic: null,
+
+  measurementsPresent: computed('characteristic', function() {
+    return this.get('characteristic.measurements.length') > 0;
+  }),
 
   sortParams: ['characteristic.characteristicTypeName', 'characteristic.sortOrder', 'characteristic.characteristicName'],
   sortAsc: true,
   paramsChanged: false,
-  sortedMeasurements: Ember.computed.sort('model.measurements', 'sortParams'),
+  sortedMeasurements: sort('characteristic.measurements', 'sortParams'),
 
   actions: {
     changeSortParam: function(col) {
-      let sort = this.get('sortAsc') ? 'asc' : 'desc';
-      let sortCol = `${col}:${sort}`;
+      const sort = this.get('sortAsc') ? 'asc' : 'desc';
+      const sortCol = `${col}:${sort}`;
       this.set('sortParams', [sortCol]);
       this.set('paramsChanged', true);
       this.toggleProperty('sortAsc');
diff --git a/app/pods/protected/characteristics/show/route.js b/app/pods/protected/characteristics/show/route.js
index f66a9c7..0f50705 100644
--- a/app/pods/protected/characteristics/show/route.js
+++ b/app/pods/protected/characteristics/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('characteristic', params.characteristic_id, { reload: true });
+    return this.store.findRecord('characteristic', params.characteristic_id);
   },
 
 });
diff --git a/app/pods/protected/characteristics/show/template.hbs b/app/pods/protected/characteristics/show/template.hbs
index c0206ee..ad4299b 100644
--- a/app/pods/protected/characteristics/show/template.hbs
+++ b/app/pods/protected/characteristics/show/template.hbs
@@ -1,55 +1,5 @@
-<div class="grid-1">
-  <div class="span-1">
-    <fieldset class="flakes-information-box">
-      <legend>
-        {{model.characteristicName}}
-      </legend>
-
-      {{! ROW 1 }}
-      <div class="grid-2 gutter-20">
-        <dl class="span-1">
-          <dt>Characteristic Type</dt>
-          <dd>
-            {{model.characteristicTypeName}}
-          </dd>
-        </dl>
-        <dl class="span-1">
-          <dt>Sort Order</dt>
-          <dd>
-            {{model.sortOrder}}
-          </dd>
-        </dl>
-      </div>
-
-      {{! ROW 2 }}
-      <div class="grid-2 gutter-20">
-        <dl class="span-2">
-          <dt>Measurements</dt>
-          <dd>
-            <p>To add/edit/remove a measurement, please visit the strain's page (links below)</p>
-            {{protected/characteristics/show/measurements-table model=model}}
-          </dd>
-        </dl>
-      </div>
-
-      {{! ROW 3 }}
-      <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>
-</div>
-{{#if model.canEdit}}
-  <br>
-  {{#link-to 'protected.characteristics.edit' model.id class="button-gray smaller"}}
-    Edit
-  {{/link-to}}
-  {{delete-button delete=(action 'delete')}}
-{{/if}}
+{{
+  protected/characteristics/show/characteristic-card
+  characteristic=model
+  on-delete=(action 'delete')
+}}
diff --git a/app/pods/protected/species/edit/controller.js b/app/pods/protected/species/edit/controller.js
index 5f7591b..3b524f9 100644
--- a/app/pods/protected/species/edit/controller.js
+++ b/app/pods/protected/species/edit/controller.js
@@ -5,5 +5,6 @@ const { Controller } = Ember;
 
 export default Controller.extend(SaveModel, {
   // Required for SaveModel mixin
-  fallbackRoute: 'protected.species.show',
+  fallbackRouteSave: 'protected.species.show',
+  fallbackRouteCancel: 'protected.species.show',
 });
diff --git a/app/pods/protected/species/index/species-table/component.js b/app/pods/protected/species/index/species-table/component.js
index fea0c08..d58f509 100644
--- a/app/pods/protected/species/index/species-table/component.js
+++ b/app/pods/protected/species/index/species-table/component.js
@@ -1,19 +1,11 @@
 import Ember from 'ember';
+import SetupMetaData from '../../../../../mixins/setup-metadata';
 
-const { Component, inject: { service }} = Ember;
+const { Component } = Ember;
 
-export default Component.extend({
-  currentUser: service('session-account'),
-
-  metaData: null,
+export default Component.extend(SetupMetaData, {
   species: null,
 
-  setupMetaDataOnInit: Ember.on('init', function() {
-    this.get('currentUser.account').then((user) => {
-      this.set('metaData', user.get('metaData'));
-    });
-  }),
-
   sortParams: ['speciesName', 'strainCount'],
   sortedSpecies: Ember.computed.sort('species', 'sortParams'),
 
diff --git a/app/pods/protected/species/new/controller.js b/app/pods/protected/species/new/controller.js
index 5f7591b..5addc72 100644
--- a/app/pods/protected/species/new/controller.js
+++ b/app/pods/protected/species/new/controller.js
@@ -5,5 +5,6 @@ const { Controller } = Ember;
 
 export default Controller.extend(SaveModel, {
   // Required for SaveModel mixin
-  fallbackRoute: 'protected.species.show',
+  fallbackRouteSave: 'protected.species.show',
+  fallbackRouteCancel: 'protected.species.index',
 });
diff --git a/app/pods/protected/species/species-form/component.js b/app/pods/protected/species/species-form/component.js
index 290e6e5..d7d319f 100644
--- a/app/pods/protected/species/species-form/component.js
+++ b/app/pods/protected/species/species-form/component.js
@@ -1,10 +1,9 @@
 import Ember from 'ember';
+import SetupMetaData from '../../../../mixins/setup-metadata';
 
-const { Component, inject: { service } } = Ember;
-
-export default Component.extend({
-  currentUser: service('session-account'),
+const { Component } = Ember;
 
+export default Component.extend(SetupMetaData, {
   // Read-only attributes
   species: null,
   isNew: null,
@@ -31,12 +30,6 @@ export default Component.extend({
     this.set('isNew', this.get('species.isNew'));
   }),
 
-  setupMetaDataOnInit: Ember.on('init', function() {
-    this.get('currentUser.account').then((user) => {
-      this.set('metaData', user.get('metaData'));
-    });
-  }),
-
   updateField: function(property, value) {
     this.set(property, value);
     // Manually compare against passed in value
diff --git a/tests/acceptance/characteristics-test.js b/tests/acceptance/characteristics-test.js
new file mode 100644
index 0000000..ad62807
--- /dev/null
+++ b/tests/acceptance/characteristics-test.js
@@ -0,0 +1,72 @@
+import Ember from 'ember';
+import { module, test } from 'qunit';
+import startApp from '../helpers/start-app';
+import { authenticateSession } from '../helpers/ember-simple-auth';
+
+module('Acceptance | characteristics', {
+  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 /characteristics', function(assert) {
+  const characteristics = server.createList('characteristics', 20);
+  visit('/characteristics');
+
+  andThen(function() {
+    assert.equal(currentURL(), '/characteristics');
+    assert.equal(find(".flakes-table > tbody > tr").length, characteristics.length);
+    assert.equal(find("#total-characteristics").text(), "Total characteristics: 20");
+  });
+});
+
+
+test('visiting /characteristics/:id', function(assert) {
+  const characteristic = server.create('characteristics');
+  visit(`/characteristics/${characteristic.id}`);
+
+  andThen(function() {
+    assert.equal(currentURL(), `/characteristics/${characteristic.id}`);
+    assert.equal(find(".flakes-information-box > legend").text().trim(), characteristic.characteristicName);
+  });
+});
+
+test('editing /characteristics/:id/edit', function(assert) {
+  const characteristic = server.create('characteristics', { 'canEdit': true });
+  visit(`/characteristics/${characteristic.id}/edit`);
+
+  andThen(function() {
+    assert.equal(currentURL(), `/characteristics/${characteristic.id}/edit`);
+
+    fillIn('.characteristic-name', 'Revised Characteristic Name');
+    click('.save-characteristic');
+
+    andThen(function() {
+      assert.equal(currentURL(), `/characteristics/${characteristic.id}`);
+      assert.equal(find(".flakes-information-box > legend").text().trim(), 'Revised Characteristic Name');
+    });
+  });
+});
+
+test('creating /characteristics/new', function(assert) {
+  visit(`/characteristics/new`);
+
+  andThen(function() {
+    assert.equal(currentURL(), `/characteristics/new`);
+    fillIn('.characteristic-name', 'New Characteristic Name');
+    click('.save-characteristic');
+
+    andThen(function() {
+      assert.equal(find(".flakes-information-box > legend").text().trim(), 'New Characteristic Name');
+      assert.equal(server.db.characteristics.length, 1);
+    });
+  });
+});
diff --git a/tests/acceptance/species-test.js b/tests/acceptance/species-test.js
index 656acd5..1b4fe85 100644
--- a/tests/acceptance/species-test.js
+++ b/tests/acceptance/species-test.js
@@ -65,6 +65,7 @@ test('creating /species/new', function(assert) {
 
     andThen(function() {
       assert.equal(find(".flakes-information-box > legend > em").text().trim(), 'New Species Name');
+      assert.equal(server.db.species.length, 1);
     });
   });
 });