diff --git a/app/components/species/species-details.js b/app/components/species/species-details.js
index 3fd4f8e..58afb31 100644
--- a/app/components/species/species-details.js
+++ b/app/components/species/species-details.js
@@ -3,18 +3,12 @@ import Ember from 'ember';
 export default Ember.Component.extend({
   classNames: ['grid-1'],
   isEditing: false,
-  isNew: false,
   actions: {
-    editSpecies: function() {
-      this.get('species').get('errors').clear();
-      if (this.get('isNew')) {
-        this.get('species').destroyRecord().then(this.sendAction());
-      }
-      this.toggleProperty('isEditing');
-      this.get('species').rollback();
+    save: function() {
+      this.sendAction('save');
+    },
+    cancel: function() {
+      this.sendAction('cancel');
     },
-    saveSpecies: function() {
-      this.get('species').save().then(this.toggleProperty('isEditing'));
-    }
   }
 });
diff --git a/app/controllers/species/index.js b/app/controllers/species/index.js
new file mode 100644
index 0000000..b5b8af0
--- /dev/null
+++ b/app/controllers/species/index.js
@@ -0,0 +1,5 @@
+import SortableController from '../sortable';
+
+export default SortableController.extend({
+  sortBy: 'speciesName',
+});
diff --git a/app/controllers/species/new.js b/app/controllers/species/new.js
new file mode 100644
index 0000000..a289976
--- /dev/null
+++ b/app/controllers/species/new.js
@@ -0,0 +1,21 @@
+import Ember from 'ember';
+
+export default Ember.Controller.extend({
+  isEditing: true,
+  actions: {
+    save: function() {
+      var species = this.get('model');
+      if (species.get('isDirty')) {
+        species.save();
+      }
+      this.transitionToRoute('species.index');
+    },
+    cancel: function() {
+      var species = this.get('model');
+      if (species.get('isNew')) {
+        species.deleteRecord();
+      }
+      this.transitionToRoute('species.index');
+    }
+  }
+});
diff --git a/app/controllers/species/show.js b/app/controllers/species/show.js
new file mode 100644
index 0000000..2d5a523
--- /dev/null
+++ b/app/controllers/species/show.js
@@ -0,0 +1,22 @@
+import Ember from 'ember';
+
+export default Ember.Controller.extend({
+  isEditing: false,
+  actions: {
+    save: function() {
+      var species = this.get('model');
+      if (species.get('isDirty')) {
+        species.save();
+      }
+      this.toggleProperty('isEditing');
+    },
+    cancel: function() {
+      if (this.get('isEditing')) {
+        var species = this.get('model');
+        species.get('errors').clear();
+        species.rollback();
+      }
+      this.toggleProperty('isEditing');
+    }
+  }
+});
diff --git a/app/templates/components/species/species-details.hbs b/app/templates/components/species/species-details.hbs
index 9772228..ee6d571 100644
--- a/app/templates/components/species/species-details.hbs
+++ b/app/templates/components/species/species-details.hbs
@@ -22,10 +22,14 @@
             {{/link-to}}
           {{/each}}
           {{#if (can "edit species" species)}}
-            <br>
-            {{#link-to 'strains.new' class="button-gray smaller"}}
-              Add Strain
-            {{/link-to}}
+            {{#if species.isNew}}
+              PENDING SAVE
+            {{else}}
+              <br>
+              {{#link-to 'strains.new' class="button-gray smaller"}}
+                Add Strain
+              {{/link-to}}
+            {{/if}}
           {{/if}}
         </dd>
       </dl>
@@ -78,11 +82,11 @@
       <div class="grid-4">
         <div class="span-1">
           {{! Does nothing ATM }}
-          <a {{bind-attr class=":smaller isEditing:button-red:button-gray"}} {{action 'editSpecies'}}>
+          <a {{bind-attr class=":smaller isEditing:button-red:button-gray"}} {{action 'cancel'}}>
             {{#if isEditing}}Cancel{{else}}Edit{{/if}}
           </a>
           {{#if isEditing}}
-            <a class="button-green smaller" {{action 'saveSpecies'}}>
+            <a class="button-green smaller" {{action 'save'}}>
               Save
             </a>
           {{/if}}
diff --git a/app/templates/species/new.hbs b/app/templates/species/new.hbs
index 06da4fc..b070c4a 100644
--- a/app/templates/species/new.hbs
+++ b/app/templates/species/new.hbs
@@ -1 +1,7 @@
-{{species/species-details species=model isEditing=true isNew=true action="cancelSpecies"}}
+{{
+  species/species-details
+  species=model
+  isEditing=true
+  save="save"
+  cancel="cancel"
+}}
diff --git a/app/templates/species/show.hbs b/app/templates/species/show.hbs
index 9112582..5f72e74 100644
--- a/app/templates/species/show.hbs
+++ b/app/templates/species/show.hbs
@@ -1 +1,7 @@
-{{species/species-details species=model}}
+{{
+  species/species-details
+  species=model
+  isEditing=isEditing
+  save="save"
+  cancel="cancel"
+}}
diff --git a/server/mocks/species.js b/server/mocks/species.js
index 3a3ca44..f3b0430 100644
--- a/server/mocks/species.js
+++ b/server/mocks/species.js
@@ -80,7 +80,8 @@ module.exports = function(app) {
   });
 
   speciesRouter.post('/', function(req, res) {
-    res.status(201).end();
+    req.body.species.id = Math.max.apply(Math, SPECIES.map(function(o){return o.id;})) + 1;
+    res.status(201).send(req.body);
   });
 
   speciesRouter.get('/:id', function(req, res) {
@@ -93,11 +94,7 @@ module.exports = function(app) {
   });
 
   speciesRouter.put('/:id', function(req, res) {
-    res.send({
-      'species': {
-        id: req.params.id
-      }
-    });
+    res.send(req.body);
   });
 
   speciesRouter.delete('/:id', function(req, res) {
diff --git a/server/mocks/strains.js b/server/mocks/strains.js
index 1d39993..d6bfccf 100644
--- a/server/mocks/strains.js
+++ b/server/mocks/strains.js
@@ -92,7 +92,8 @@ module.exports = function(app) {
   });
 
   strainsRouter.post('/', function(req, res) {
-    res.status(201).end();
+    req.body.strain.id = Math.max.apply(Math, STRAINS.map(function(o){return o.id;})) + 1;
+    res.status(201).send(req.body);
   });
 
   strainsRouter.get('/:id', function(req, res) {