diff --git a/public/js/stores/FeatureToggleActions.js b/public/js/stores/FeatureToggleActions.js
index a7e8b282c0..c06c5ee499 100644
--- a/public/js/stores/FeatureToggleActions.js
+++ b/public/js/stores/FeatureToggleActions.js
@@ -1,7 +1,51 @@
 var Reflux = require("reflux");
-module.exports = {
-  create:  Reflux.createAction({ asyncResult: true }),
-  update:  Reflux.createAction({ asyncResult: true }),
-  archive: Reflux.createAction({ asyncResult: true }),
-  revive:  Reflux.createAction({ asyncResult: true })
-};
+var Server = require('./FeatureToggleServerFacade');
+
+var FeatureToggleActions = Reflux.createActions({
+    'create':   { asyncResult: true },
+    'update':   { asyncResult: true },
+    'archive':  { asyncResult: true },
+    'revive':   { asyncResult: true }
+});
+
+FeatureToggleActions.create.listen(function(feature){
+    Server.createFeature(feature, function(error) {
+      if(error) {
+        this.failed(error);
+      } else {
+        this.completed(feature);
+    }
+    }.bind(this));
+});
+
+FeatureToggleActions.update.listen(function(feature){
+    Server.updateFeature(feature, function(error) {
+      if(error) {
+        this.failed(error);
+      } else {
+        this.completed(feature);
+    }
+    }.bind(this));
+});
+
+FeatureToggleActions.archive.listen(function(feature){
+    Server.archiveFeature(feature, function(error) {
+      if(error) {
+        this.failed(error);
+      } else {
+        this.completed(feature);
+    }
+    }.bind(this));
+});
+
+FeatureToggleActions.revive.listen(function(feature){
+    Server.reviveFeature(feature, function(error) {
+      if(error) {
+        this.failed(error);
+      } else {
+        this.completed(feature);
+    }
+    }.bind(this));
+});
+
+module.exports = FeatureToggleActions;
diff --git a/public/js/stores/FeatureToggleStore.js b/public/js/stores/FeatureToggleStore.js
index 19a882c2bb..e8567c0a74 100644
--- a/public/js/stores/FeatureToggleStore.js
+++ b/public/js/stores/FeatureToggleStore.js
@@ -10,10 +10,10 @@ var _archivedToggles = [];
 var FeatureStore = Reflux.createStore({
   // Initial setup
   init: function() {
-    this.listenTo(FeatureActions.create,  this.onCreate);
-    this.listenTo(FeatureActions.update,  this.onUpdate);
-    this.listenTo(FeatureActions.archive, this.onArchive);
-    this.listenTo(FeatureActions.revive,  this.onRevive);
+    this.listenTo(FeatureActions.create.completed,  this.onCreate);
+    this.listenTo(FeatureActions.update.completed,  this.onUpdate);
+    this.listenTo(FeatureActions.archive.completed, this.onArchive);
+    this.listenTo(FeatureActions.revive.completed,  this.onRevive);
 
     this.timer = new Timer(this.loadDataFromServer, 30*1000);
     this.timer.start();
@@ -31,47 +31,7 @@ var FeatureStore = Reflux.createStore({
   },
 
   onCreate: function(feature) {
-    Server.createFeature(feature, function(error) {
-      if(error) {
-        FeatureActions.create.failed(error);
-      } else {
-        this.setToggles([feature].concat(_featureToggles));
-        FeatureActions.create.completed();
-      }
-    }.bind(this));
-  },
-
-  onArchive: function(feature) {
-    Server.archiveFeature(feature, function(error) {
-      if(error) {
-        FeatureActions.archive.failed(error);
-      } else {
-        this.archiveToggle(feature);
-        FeatureActions.archive.completed();
-      }
-    }.bind(this));
-  },
-
-  onUpdate: function(feature) {
-    Server.updateFeature(feature, function(error) {
-      if(error) {
-        FeatureActions.update.failed(error);
-      } else {
-        this.updateToggle(feature);
-        FeatureActions.update.completed();
-      }
-    }.bind(this));
-  },
-
-  onRevive: function(feature) {
-    Server.reviveFeature(feature, function(error) {
-      if(error) {
-        FeatureActions.revive.failed(error);
-      } else {
-        this.revive(feature);
-        FeatureActions.revive.completed();
-      }
-    }.bind(this));
+      this.setToggles([feature].concat(_featureToggles));
   },
 
   setToggles: function(toggles) {
@@ -79,7 +39,7 @@ var FeatureStore = Reflux.createStore({
     this.trigger();
   },
 
-  updateToggle: function(feature) {
+  onUpdate: function(feature) {
     var idx;
     _featureToggles.forEach(function(item, i) {
       if(item.name === feature.name) {
@@ -90,7 +50,7 @@ var FeatureStore = Reflux.createStore({
     this.trigger();
   },
 
-  archiveToggle: function(feature) {
+  onArchive: function(feature) {
     var idx;
     _featureToggles.forEach(function(item, i) {
       if(item.name === feature.name) {
@@ -102,7 +62,7 @@ var FeatureStore = Reflux.createStore({
     this.trigger();
   },
 
-  revive: function(item) {
+  onRevive: function(item) {
     var newStore = _archivedToggles.filter(function(f) {
         return f.name !== item.name;
     });