diff --git a/app/helpers/get-property.js b/app/helpers/get-property.js
index 6b2308d..9801d7b 100644
--- a/app/helpers/get-property.js
+++ b/app/helpers/get-property.js
@@ -1,8 +1,8 @@
 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);
+// This will be unneccesary when ember 2.0 lands
+export default helper(function(params) {
+  return get(params[0], params[1]);
+});
diff --git a/app/pods/components/x-select/component.js b/app/pods/components/x-select/component.js
new file mode 100644
index 0000000..eada7b0
--- /dev/null
+++ b/app/pods/components/x-select/component.js
@@ -0,0 +1,39 @@
+import Ember from 'ember';
+
+const { Component } = Ember;
+
+export default Component.extend({
+  tagName: 'select',
+
+  value: null,
+  nameAttr: null,
+  listItems: null,
+  placeholder: null,
+  selected: null,
+  selectize: null,
+
+  attributeBindings: [
+    'multiple',
+  ],
+
+  change: function() {
+    this.attrs["update"](this.get('selectize').getValue());
+  },
+
+  didReceiveAttrs: function() {
+    this._super(...arguments);
+
+    if (!this.attrs.update) {
+      throw new Error(`You must provide an \`update\` action.`);
+    }
+  },
+
+  didInsertElement: function() {
+    this.$().selectize({
+      plugins: ['drag_drop'],
+      items: this.get('selected'),
+    });
+    this.set('selectize', this.$()[0].selectize);
+  },
+
+});
diff --git a/app/pods/components/x-select/template.hbs b/app/pods/components/x-select/template.hbs
new file mode 100644
index 0000000..093ed1e
--- /dev/null
+++ b/app/pods/components/x-select/template.hbs
@@ -0,0 +1,6 @@
+{{#if placeholder}}
+  <option value="">{{placeholder}}</option>
+{{/if}}
+{{#each listItems as |option|}}
+  <option value={{option.id}} selected={{equal option.id value.id}}>{{get-property option nameAttr}}</option>
+{{/each}}
diff --git a/app/pods/protected/compare/results/route.js b/app/pods/protected/compare/results/route.js
index 4ae7fd0..72c01f2 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..f98999d 100644
--- a/app/pods/protected/compare/select-form/component.js
+++ b/app/pods/protected/compare/select-form/component.js
@@ -13,10 +13,10 @@ export default Component.extend({
   selectedStrains: null,
   selectedCharacteristics: null,
 
-  updateStrains: function(selection) {
-    this.set('selectedStrains', selection);
-    this.attrs['update-strains'](this.get('selectedStrains'));
-  },
+  // updateStrains: function(selection) {
+  //   this.set('selectedStrains', selection);
+  //   this.attrs['update-strains'](this.get('selectedStrains'));
+  // },
 
   updateCharacteristics: function(selection) {
     this.set('selectedCharacteristics', selection);
@@ -57,5 +57,10 @@ export default Component.extend({
     deselectAllCharacteristics: function() {
       this.updateCharacteristics("");
     },
+
+    updateStrainSelection: function(selection) {
+      this.set('selectedStrains', selection);
+      this.attrs["update-strains"](selection);
+    },
   },
 });
diff --git a/app/pods/protected/compare/select-form/template.hbs b/app/pods/protected/compare/select-form/template.hbs
index 61a07a5..5068a7c 100644
--- a/app/pods/protected/compare/select-form/template.hbs
+++ b/app/pods/protected/compare/select-form/template.hbs
@@ -5,13 +5,13 @@
         <li>
           <label>Strains</label>
           {{
-            select-2
+            x-select
+            listItems=strains
+            nameAttr="fullNameMU"
+            update=(action "updateStrainSelection")
+            placeholder="Select one ore more strains"
             multiple=true
-            content=strains
-            value=selectedStrains
-            optionValuePath="id"
-            optionLabelPath="fullNameMU"
-            placeholder="Select one or more strains"
+            selected=selectedStrains
           }}
         </li>
         <li>