diff --git a/assets/javascripts/discourse/controllers/choice-form.js.es6 b/assets/javascripts/discourse/controllers/choice-form.js.es6
new file mode 100644
index 0000000..55838fc
--- /dev/null
+++ b/assets/javascripts/discourse/controllers/choice-form.js.es6
@@ -0,0 +1,8 @@
+
+export default Ember.Controller.extend({
+  actions: {
+    someThing: function() {
+      console.log('w00t! something happened!');
+    }
+  }
+});
diff --git a/assets/javascripts/discourse/templates/choice/form.hbs b/assets/javascripts/discourse/templates/choice/form.hbs
index 5ef4961..18294ba 100644
--- a/assets/javascripts/discourse/templates/choice/form.hbs
+++ b/assets/javascripts/discourse/templates/choice/form.hbs
@@ -3,11 +3,11 @@
 <form class="choice-discourse-form form-horizontal">
 
 <div>
-  <div class='controls'>
+  <div>
     {{text-field}}
   </div>
-  <div class='span10 controls'>
-    <button class='btn btn-primary'>something</button>
+  <div>
+    <button class='btn btn-primary' {{action "someThing"}}>something</button>
   </div>
 </div>