diff --git a/.gitignore b/.gitignore
index 581ad43..86fceae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,3 @@
 /libpeerconnection.log
 npm-debug.log
 testem.log
-.divshot-cache
\ No newline at end of file
diff --git a/app/helpers/get-property.js b/app/helpers/get-property.js
index 6b2308d..4ba442b 100644
--- a/app/helpers/get-property.js
+++ b/app/helpers/get-property.js
@@ -1,8 +1,7 @@
 import Ember from 'ember';
 
-// This will be unneccesary when ember 2.0 lands
-export function getProperty(params) {
-  return Ember.get(params[0], params[1]);
-}
+const { get, Helper: { helper } } = Ember;
 
-export default Ember.HTMLBars.makeBoundHelper(getProperty);
+export default helper(function(params) {
+  return get(params[0], params[1]);
+});
diff --git a/app/models/species.js b/app/models/species.js
index 7581d10..6e4ac05 100644
--- a/app/models/species.js
+++ b/app/models/species.js
@@ -17,9 +17,4 @@ export default Model.extend({
   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 b202a78..ef5e41c 100644
--- a/app/models/strain.js
+++ b/app/models/strain.js
@@ -2,6 +2,7 @@ import DS from 'ember-data';
 import Ember from 'ember';
 
 const { Model, hasMany, belongsTo, attr } = DS;
+const { computed } = Ember;
 
 export default Model.extend({
   measurements       : hasMany('measurements', { async: false }),
@@ -22,19 +23,14 @@ export default Model.extend({
   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() {
+  // Used internally for sorting
+  fullName: computed('species', 'strainName', function() {
     return `${this.get('species.speciesName')} ${this.get('strainNameMU')}`;
   }),
 
   // TODO: move this to component/helper
+  // Can't move until Select2 refactor
   fullNameMU: function() {
-    return Ember.String.htmlSafe(`<em>${this.get('species.speciesName')}</em> ${this.get('strainNameMU')}`);
+    return Ember.String.htmlSafe(`<em>${this.get('species.speciesName')}</em> ${this.get('strainName')}`);
   }.property('species', 'strainNameMU').readOnly(),
 });
diff --git a/app/pods/components/delete-button/component.js b/app/pods/components/delete-button/component.js
index 2ceca5b..1cd364a 100644
--- a/app/pods/components/delete-button/component.js
+++ b/app/pods/components/delete-button/component.js
@@ -2,10 +2,13 @@ import Ember from 'ember';
 
 export default Ember.Component.extend({
   tagName: 'button',
-  classNames: ["button-red", "smaller"],
+  classNames: ["button-red", "smaller", "delete"],
+  showConfirmDelete: false,
 
   click: function() {
-    if (window.confirm("Do you really want to delete this?")) {
+    if (!this.get('showConfirmDelete')) {
+      this.set('showConfirmDelete', true);
+    } else {
       this.attrs.delete();
     }
   },
diff --git a/app/pods/components/delete-button/template.hbs b/app/pods/components/delete-button/template.hbs
index 4b2e04f..de6c612 100644
--- a/app/pods/components/delete-button/template.hbs
+++ b/app/pods/components/delete-button/template.hbs
@@ -1 +1,5 @@
-Delete
+{{#if showConfirmDelete}}
+  Are you sure?
+{{else}}
+  Delete
+{{/if}}
diff --git a/app/pods/components/strain-name/template.hbs b/app/pods/components/strain-name/template.hbs
new file mode 100644
index 0000000..38822c5
--- /dev/null
+++ b/app/pods/components/strain-name/template.hbs
@@ -0,0 +1 @@
+{{strain.strainName}}{{{if strain.typeStrain '<sup>T</sup>' ''}}}
diff --git a/app/pods/components/x-select/component.js b/app/pods/components/x-select/component.js
new file mode 100644
index 0000000..c5ce421
--- /dev/null
+++ b/app/pods/components/x-select/component.js
@@ -0,0 +1,35 @@
+import Ember from 'ember';
+
+const { Component } = Ember;
+
+export default Component.extend({
+  tagName: 'select',
+  attributeBindings: [
+    'multiple',
+  ],
+
+  options: null,
+  selected: null,
+  nameAttr: null,
+
+  change: function() {
+    this.attrs.update(this.$().select2('val'));
+  },
+
+  didInsertElement: function() {
+    if (this.get('placeholder')) {
+      this.$().select2({
+        placeholder: this.get('placeholder'),
+      });
+    } else {
+      this.$().select2();
+    }
+  },
+
+  didRender: function() {
+    Ember.run.schedule('afterRender', this, function() {
+      this.$().select2('val', this.get('selected'));
+    });
+  },
+
+});
diff --git a/app/pods/components/x-select/template.hbs b/app/pods/components/x-select/template.hbs
new file mode 100644
index 0000000..131449b
--- /dev/null
+++ b/app/pods/components/x-select/template.hbs
@@ -0,0 +1,3 @@
+{{#each options as |option|}}
+  <option value={{option.id}}>{{get-property option nameAttr}}</option>
+{{/each}}
diff --git a/app/pods/protected/characteristics/show/measurements-table/template.hbs b/app/pods/protected/characteristics/show/measurements-table/template.hbs
index 8ee1a86..8c7e2cb 100644
--- a/app/pods/protected/characteristics/show/measurements-table/template.hbs
+++ b/app/pods/protected/characteristics/show/measurements-table/template.hbs
@@ -17,7 +17,7 @@
       <tr>
         <td>
           {{#link-to 'protected.strains.show' row.strain.id}}
-            {{{row.strain.strainNameMU}}}
+            {{strain-name strain=row.strain}}
           {{/link-to}}
         </td>
         <td>
diff --git a/app/pods/protected/compare/controller.js b/app/pods/protected/compare/controller.js
index 0ba05a4..378407e 100644
--- a/app/pods/protected/compare/controller.js
+++ b/app/pods/protected/compare/controller.js
@@ -3,8 +3,8 @@ import Ember from 'ember';
 const { Controller } = Ember;
 
 export default Controller.extend({
-  selectedStrains: null,
-  selectedCharacteristics: null,
+  selectedStrains: [],
+  selectedCharacteristics: [],
 
   actions: {
     search: function(query) {
diff --git a/app/pods/protected/compare/results/route.js b/app/pods/protected/compare/results/route.js
index 4ae7fd0..6848827 100644
--- a/app/pods/protected/compare/results/route.js
+++ b/app/pods/protected/compare/results/route.js
@@ -30,8 +30,8 @@ export default Route.extend({
     }
 
     const compare = this.controllerFor('protected.compare');
-    compare.set('selectedStrains', params.strain_ids);
-    compare.set('selectedCharacteristics', params.characteristic_ids);
+    compare.set('selectedStrains', params.strain_ids.split(","));
+    compare.set('selectedCharacteristics', params.characteristic_ids.split(","));
 
     return this.get('ajax').request('/compare', { data: params });
   },
@@ -45,14 +45,14 @@ export default Route.extend({
     const compare = this.controllerFor('protected.compare');
 
     const strains = [];
-    const strain_ids = compare.get('selectedStrains').split(',');
+    const strain_ids = compare.get('selectedStrains');
     strain_ids.forEach((id) => {
       strains.push(this.store.peekRecord('strain', id));
     });
     controller.set('strains', strains);
 
     const characteristics = [];
-    const characteristic_ids = compare.get('selectedCharacteristics').split(',');
+    const characteristic_ids = compare.get('selectedCharacteristics');
     characteristic_ids.forEach((id) => {
       characteristics.push(this.store.peekRecord('characteristic', id));
     });
diff --git a/app/pods/protected/compare/select-form/component.js b/app/pods/protected/compare/select-form/component.js
index db58626..4801506 100644
--- a/app/pods/protected/compare/select-form/component.js
+++ b/app/pods/protected/compare/select-form/component.js
@@ -10,8 +10,8 @@ export default Component.extend({
   "update-strains": null,
   "update-characteristics": null,
 
-  selectedStrains: null,
-  selectedCharacteristics: null,
+  selectedStrains: [],
+  selectedCharacteristics: [],
 
   updateStrains: function(selection) {
     this.set('selectedStrains', selection);
@@ -38,11 +38,11 @@ export default Component.extend({
       strains.forEach((strain) => {
         strain_ids.push(strain.get('id'));
       });
-      this.updateStrains(strain_ids.join(","));
+      this.updateStrains(strain_ids);
     },
 
     deselectAllStrains: function() {
-      this.updateStrains("");
+      this.updateStrains([]);
     },
 
     selectAllCharacteristics: function() {
@@ -51,11 +51,19 @@ export default Component.extend({
       chars.forEach((char) => {
         char_ids.push(char.get('id'));
       });
-      this.updateCharacteristics(char_ids.join(","));
+      this.updateCharacteristics(char_ids);
     },
 
     deselectAllCharacteristics: function() {
-      this.updateCharacteristics("");
+      this.updateCharacteristics([]);
+    },
+
+    updateStrainSelection: function(selection) {
+      this.updateStrains(selection);
+    },
+
+    updateCharacteristicsSelection: function(selection) {
+      this.updateCharacteristics(selection);
     },
   },
 });
diff --git a/app/pods/protected/compare/select-form/template.hbs b/app/pods/protected/compare/select-form/template.hbs
index 61a07a5..eaa7713 100644
--- a/app/pods/protected/compare/select-form/template.hbs
+++ b/app/pods/protected/compare/select-form/template.hbs
@@ -5,12 +5,12 @@
         <li>
           <label>Strains</label>
           {{
-            select-2
+            x-select
+            options=strains
+            nameAttr='fullNameMU'
             multiple=true
-            content=strains
-            value=selectedStrains
-            optionValuePath="id"
-            optionLabelPath="fullNameMU"
+            selected=selectedStrains
+            update=(action "updateStrainSelection")
             placeholder="Select one or more strains"
           }}
         </li>
@@ -25,12 +25,12 @@
         <li>
           <label>Characteristics</label>
           {{
-            select-2
+            x-select
+            options=characteristics
+            nameAttr='characteristicName'
             multiple=true
-            content=characteristics
-            value=selectedCharacteristics
-            optionValuePath="id"
-            optionLabelPath="characteristicName"
+            selected=selectedCharacteristics
+            update=(action "updateCharacteristicsSelection")
             placeholder="Select one or more characteristics"
           }}
         </li>
diff --git a/app/pods/protected/species/index/species-table/template.hbs b/app/pods/protected/species/index/species-table/template.hbs
index f96f9cf..ab9d772 100644
--- a/app/pods/protected/species/index/species-table/template.hbs
+++ b/app/pods/protected/species/index/species-table/template.hbs
@@ -23,7 +23,7 @@
           {{#each species.strains as |strain index|}}
             {{if index ","}}
             {{#link-to 'protected.strains.show' strain.id}}
-              {{{strain.strainNameMU}}}
+              {{strain-name strain=strain}}
             {{/link-to}}
           {{/each}}
         </td>
diff --git a/app/pods/protected/species/show/species-card/template.hbs b/app/pods/protected/species/show/species-card/template.hbs
index fac8247..b4e753d 100644
--- a/app/pods/protected/species/show/species-card/template.hbs
+++ b/app/pods/protected/species/show/species-card/template.hbs
@@ -14,7 +14,7 @@
               {{#each species.strains as |strain index|}}
                 <li>
                   {{#link-to 'protected.strains.show' strain.id}}
-                    {{{strain.strainNameMU}}}
+                    {{strain-name strain=strain}}
                   {{/link-to}}
                 </li>
               {{/each}}
diff --git a/app/pods/protected/species/species-form/template.hbs b/app/pods/protected/species/species-form/template.hbs
index 888b03e..f523d56 100644
--- a/app/pods/protected/species/species-form/template.hbs
+++ b/app/pods/protected/species/species-form/template.hbs
@@ -19,7 +19,7 @@
         {{#each strains as |strain index|}}
           {{if index ","}}
           {{#link-to 'protected.strains.show' strain.id}}
-            {{{strain.strainNameMU}}}
+            {{strain-name strain=strain}}
           {{/link-to}}
         {{/each}}
         {{add-button label="Add Strain" link="protected.strains.new" canAdd=metaData.canAdd}}
diff --git a/app/pods/protected/strains/show/strain-card/template.hbs b/app/pods/protected/strains/show/strain-card/template.hbs
index 995326a..517256d 100644
--- a/app/pods/protected/strains/show/strain-card/template.hbs
+++ b/app/pods/protected/strains/show/strain-card/template.hbs
@@ -1,7 +1,7 @@
 <div class="span-1">
   <fieldset class="flakes-information-box">
     <legend>
-      {{strain.strainNameMU}}
+      {{strain-name strain=strain}}
     </legend>
 
     {{! ROW 1 }}
@@ -10,7 +10,7 @@
         <dt>Species</dt>
         <dd>
           {{#link-to 'protected.species.show' strain.species.id}}
-            <em>{{strain.species.speciesNameMU}}</em>
+            <em>{{strain.species.speciesName}}</em>
           {{/link-to}}
         </dd>
       </dl>
diff --git a/app/pods/protected/strains/strain-form/template.hbs b/app/pods/protected/strains/strain-form/template.hbs
index 47c5112..dabfd7c 100644
--- a/app/pods/protected/strains/strain-form/template.hbs
+++ b/app/pods/protected/strains/strain-form/template.hbs
@@ -15,11 +15,13 @@
     <div data-row-span="2">
       <div data-field-span="2">
         <label>Species</label>
-        <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>
+        {{
+          x-select
+          options=speciesList
+          nameAttr='speciesName'
+          selected=species.id
+          update=(action "speciesDidChange")
+        }}
       </div>
     </div>
     <div data-row-span="2">
diff --git a/app/pods/protected/users/changepassword/controller.js b/app/pods/protected/users/changepassword/controller.js
index 9119f1a..638961f 100644
--- a/app/pods/protected/users/changepassword/controller.js
+++ b/app/pods/protected/users/changepassword/controller.js
@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import ajaxErrorNew from '../../../../utils/ajax-error-new';
 
 const { Controller, inject: { service } } = Ember;
 
@@ -11,9 +12,12 @@ export default Controller.extend({
     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.');
+      this.get('ajax').post('/users/password', { data: data }).then(() => {
+        this.transitionToRoute('protected.users.show', id);
+        this.get('flashMessages').information('Your password has been changed.');
+      }, (error) => {
+        ajaxErrorNew(error, this.get('flashMessages'));
+      });
     },
 
     cancel: function() {
diff --git a/app/utils/ajax-error-new.js b/app/utils/ajax-error-new.js
new file mode 100644
index 0000000..37031f2
--- /dev/null
+++ b/app/utils/ajax-error-new.js
@@ -0,0 +1,7 @@
+export default function ajaxErrorNew(error, flash) {
+  flash.clearMessages();
+  error.errors.forEach((error) => {
+    const source = error.source.pointer.split('/');
+    flash.error(`${source[source.length-1].replace(/([A-Z])/g, ' $1').capitalize()} - ${error.detail}`);
+  });
+}
diff --git a/package.json b/package.json
index 9347f07..d0dd04f 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
   "license": "MIT",
   "devDependencies": {
     "broccoli-asset-rev": "^2.2.0",
-    "ember-cli": "1.13.11",
+    "ember-cli": "1.13.12",
     "ember-cli-app-version": "^1.0.0",
     "ember-cli-babel": "^5.1.5",
     "ember-cli-content-security-policy": "0.4.0",
@@ -39,7 +39,6 @@
     "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"
   }
 }