diff --git a/public/javascripts/diaspora.js b/public/javascripts/diaspora.js
new file mode 100644
index 000000000..4543959fe
--- /dev/null
+++ b/public/javascripts/diaspora.js
@@ -0,0 +1,18 @@
+var Diaspora = Diaspora || {};
+Diaspora.widgets = Diaspora.widgets || {
+  pageWidgets: {},
+  
+  add: function(widgetId, widget) {
+    this.pageWidgets[widgetId] = widget;
+  },
+
+  remove: function(widgetId) {
+    delete this.pageWidgets[widgetId];
+  },
+
+  init: function() {
+    for (var widgetId in this.pageWidgets) {
+      this.pageWidgets[widgetId].start();
+    }
+  }
+};
\ No newline at end of file
diff --git a/spec/javascripts/diaspora-spec.js b/spec/javascripts/diaspora-spec.js
new file mode 100644
index 000000000..259d1288d
--- /dev/null
+++ b/spec/javascripts/diaspora-spec.js
@@ -0,0 +1,28 @@
+describe("Diaspora", function() {
+  describe("widgets", function() {
+    beforeEach(function() {
+      Diaspora.widgets.pageWidgets = {};
+    });
+    describe("add", function() {
+      it("adds a widget to the list of pageWidgets", function() {
+        expect(Diaspora.widgets.pageWidgets["nameOfWidget"]).not.toBeDefined();
+        Diaspora.widgets.add("nameOfWidget", {});
+        expect(Diaspora.widgets.pageWidgets["nameOfWidget"]).toBeDefined();
+      });
+    });
+    describe("remove", function() {
+      it("removes a widget from the list of pageWidgets", function() {
+        Diaspora.widgets.add("nameOfWidget", {});
+        expect(Diaspora.widgets.pageWidgets["nameOfWidget"]).toBeDefined();
+        Diaspora.widgets.remove("nameOfWidget");
+        expect(Diaspora.widgets.pageWidgets["nameOfWidget"]).not.toBeDefined();
+      });
+    });
+    describe("init", function() {
+      Diaspora.widgets.add("nameOfWidget", {start:$.noop});
+      spyOn(Diaspora.widgets.pageWidgets["nameOfWidget"], "start");
+      Diaspora.widgets.init();
+      expect(Diaspora.widgets.pageWidgets["nameOfWidget"].start).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/spec/javascripts/support/jasmine.yml b/spec/javascripts/support/jasmine.yml
index 0b4956875..7f1788cae 100644
--- a/spec/javascripts/support/jasmine.yml
+++ b/spec/javascripts/support/jasmine.yml
@@ -14,6 +14,7 @@ src_files:
   - public/javascripts/vendor/jquery144.js
   - public/javascripts/vendor/jquery-ui-1.8.6.custom.min.js
   - public/javascripts/vendor/jquery.tipsy.js
+  - public/javascripts/diaspora.js
   - public/javascripts/mobile.js
   - public/javascripts/aspect-edit.js
   - public/javascripts/web-socket-receiver.js