diff --git a/files/dashLoader.js b/files/dashLoader.js
new file mode 100644
index 0000000..31850bb
--- /dev/null
+++ b/files/dashLoader.js
@@ -0,0 +1,122 @@
+define([
+  'angular',
+  'lodash'
+],
+function (angular, _) {
+  'use strict';
+
+  var module = angular.module('kibana.controllers');
+
+  module.controller('dashLoader', function($scope, $http, timer, dashboard, alertSrv, $location) {
+    $scope.loader = dashboard.current.loader;
+
+    $scope.init = function() {
+      $scope.gist_pattern = /(^\d{5,}$)|(^[a-z0-9]{10,}$)|(gist.github.com(\/*.*)\/[a-z0-9]{5,}\/*$)/;
+      $scope.gist = $scope.gist || {};
+      $scope.elasticsearch = $scope.elasticsearch || {};
+    };
+
+    $scope.showDropdown = function(type) {
+      if(_.isUndefined(dashboard.current.loader)) {
+        return true;
+      }
+
+      var _l = dashboard.current.loader;
+      if(type === 'load') {
+        return (_l.load_elasticsearch || _l.load_gist || _l.load_local);
+      }
+      if(type === 'save') {
+        return (_l.save_elasticsearch || _l.save_gist || _l.save_local || _l.save_default);
+      }
+      if(type === 'share') {
+        return (_l.save_temp);
+      }
+      return false;
+    };
+
+    $scope.set_default = function() {
+      if(dashboard.set_default($location.path())) {
+        alertSrv.set('Home Set','This page has been set as your default Kibana dashboard','success',5000);
+      } else {
+        alertSrv.set('Incompatible Browser','Sorry, your browser is too old for this feature','error',5000);
+      }
+    };
+
+    $scope.purge_default = function() {
+      if(dashboard.purge_default()) {
+        alertSrv.set('Local Default Clear','Your Kibana default dashboard has been reset to the default',
+          'success',5000);
+      } else {
+        alertSrv.set('Incompatible Browser','Sorry, your browser is too old for this feature','error',5000);
+      }
+    };
+
+    $scope.elasticsearch_save = function(type,ttl) {
+      $scope.share = {
+        location  : window.location.href.replace(window.location.hash,""),
+        type      : "temp",
+        id        : "urllink",
+        // Note that we hvae to do the encode json thing because kibana
+        // wants the parameters to be json quoted then url quoted ... :(
+        link      : window.location.href.replace(window.location.hash,"")+"#dashboard/file/logstash.json?query="+encodeURI(JSON.stringify(dashboard.current.services.query.list[0].query).slice(1,-1)),
+        title     : "Share URL"
+      };
+      return;
+    };
+
+    $scope.elasticsearch_delete = function(id) {
+      dashboard.elasticsearch_delete(id).then(
+        function(result) {
+          if(!_.isUndefined(result)) {
+            if(result.found) {
+              alertSrv.set('Dashboard Deleted',id+' has been deleted','success',5000);
+              // Find the deleted dashboard in the cached list and remove it
+              var toDelete = _.where($scope.elasticsearch.dashboards,{_id:id})[0];
+              $scope.elasticsearch.dashboards = _.without($scope.elasticsearch.dashboards,toDelete);
+            } else {
+              alertSrv.set('Dashboard Not Found','Could not find '+id+' in Elasticsearch','warning',5000);
+            }
+          } else {
+            alertSrv.set('Dashboard Not Deleted','An error occurred deleting the dashboard','error',5000);
+          }
+        }
+      );
+    };
+
+    $scope.elasticsearch_dblist = function(query) {
+      dashboard.elasticsearch_list(query,$scope.loader.load_elasticsearch_size).then(
+        function(result) {
+        if(!_.isUndefined(result.hits)) {
+          $scope.hits = result.hits.total;
+          $scope.elasticsearch.dashboards = result.hits.hits;
+        }
+      });
+    };
+
+    $scope.save_gist = function() {
+      dashboard.save_gist($scope.gist.title).then(
+        function(link) {
+        if(!_.isUndefined(link)) {
+          $scope.gist.last = link;
+          alertSrv.set('Gist saved','You will be able to access your exported dashboard file at '+
+            '<a href="'+link+'">'+link+'</a> in a moment','success');
+        } else {
+          alertSrv.set('Save failed','Gist could not be saved','error',5000);
+        }
+      });
+    };
+
+    $scope.gist_dblist = function(id) {
+      dashboard.gist_list(id).then(
+        function(files) {
+        if(files && files.length > 0) {
+          $scope.gist.files = files;
+        } else {
+          alertSrv.set('Gist Failed','Could not retrieve dashboard list from gist','error',5000);
+        }
+      });
+    };
+
+  });
+
+});
diff --git a/manifests/js.pp b/manifests/js.pp
index eb1c3b5..21dc383 100644
--- a/manifests/js.pp
+++ b/manifests/js.pp
@@ -51,6 +51,14 @@ class kibana::js (
     subscribe => Vcsrepo[$base_path],
   }
 
+  file { "${base_path}/src/app/controllers/dashLoader.js":
+    ensure    => present,
+    source    => 'puppet:///modules/kibana/dashLoader.js',
+    owner     => 'www-data',
+    require   => Vcsrepo[$base_path],
+    subscribe => Vcsrepo[$base_path],
+  }
+
   httpd::vhost { 'kibana':
     docroot       => "${base_path}/src",
     vhost_name    => $vhost_name,