diff --git a/app/mixins/save-model.js b/app/mixins/save-model.js
index e7d920e..97cc97b 100644
--- a/app/mixins/save-model.js
+++ b/app/mixins/save-model.js
@@ -7,10 +7,12 @@ export default Mixin.create({
   fallbackRoute: null,
 
   actions: {
-    save: function() {
+    save: function(properties) {
       const model = this.get('model');
       const fallbackRoute = this.get('fallbackRoute');
 
+      model.setProperties(properties);
+
       if (model.get('hasDirtyAttributes')) {
         model.save().then((model) => {
           this.transitionToRoute(fallbackRoute, model);
diff --git a/app/pods/protected/species/species-form/component.js b/app/pods/protected/species/species-form/component.js
index 0e261d8..5b73342 100644
--- a/app/pods/protected/species/species-form/component.js
+++ b/app/pods/protected/species/species-form/component.js
@@ -8,6 +8,21 @@ export default Component.extend({
   species: null,
   "on-save": null,
   "on-cancel": null,
+  "on-update": null,
+
+  speciesName: null,
+  typeSpecies: null,
+
+  updateField: function(property, value) {
+    this.set(property, value);
+  },
+
+  resetOnInit: Ember.on('init', function() {
+    ['speciesName', 'typeSpecies'].forEach((field) => {
+      const valueInSpecies = this.get('species').get(field);
+      this.set(field, valueInSpecies);
+    });
+  }),
 
   setupMetaDataOnInit: Ember.on('init', function() {
     this.get('currentUser.account').then((user) => {
@@ -17,11 +32,20 @@ export default Component.extend({
 
   actions: {
     save: function() {
-      return this.attrs['on-save']();
+      return this.attrs['on-save'](this.getProperties(['speciesName', 'typeSpecies']));
     },
 
     cancel: function() {
       return this.attrs['on-cancel']();
     },
-  }
+
+    nameDidChange: function(value) {
+      this.updateField('speciesName', value);
+    },
+
+    typeSpeciesDidChange: function() {
+      this.toggleProperty('typeSpecies');
+      console.log(this.get('typeSpecies'));
+    },
+  },
 });
diff --git a/app/pods/protected/species/species-form/template.hbs b/app/pods/protected/species/species-form/template.hbs
index ea1b693..0813123 100644
--- a/app/pods/protected/species/species-form/template.hbs
+++ b/app/pods/protected/species/species-form/template.hbs
@@ -1,14 +1,14 @@
 <form class="grid-form" {{action 'save' on='submit'}}>
   <fieldset>
-    <legend><em>{{species.speciesName}}</em></legend>
+    <legend><em>{{speciesName}}</em></legend>
     <div data-row-span="2">
       <div data-field-span="1">
         <label>Species Name</label>
-        {{input value=species.speciesName class="species-name"}}
+        {{one-way-input type="text" class="species-name" value=speciesName update=(action "nameDidChange")}}
       </div>
       <div data-field-span="1">
         <label>Type Species?</label>
-        {{input type="checkbox" checked=species.typeSpecies}} {{if species.typeSpecies 'Yes' 'No'}}
+        {{one-way-input type="checkbox" value=typeSpecies update=(action "typeSpeciesDidChange")}} {{if typeSpecies 'Yes' 'No'}}
       </div>
     </div>
     {{#unless species.isNew}}
@@ -37,9 +37,7 @@
   <a class="button-red smaller" {{action 'cancel'}}>
     Cancel
   </a>
-  {{#if species.hasDirtyAttributes}}
-    <button type="submit" class="button-green smaller save-species">
-      Save
-    </button>
-  {{/if}}
+  <button type="submit" class="button-green smaller save-species">
+    Save
+  </button>
 </form>