diff --git a/hacking/NavAngular.unit.js b/hacking/NavAngular.unit.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/hacking/TabBarController.unit.js b/hacking/TabBarController.unit.js
index e844344019..296a44ab54 100644
--- a/hacking/TabBarController.unit.js
+++ b/hacking/TabBarController.unit.js
@@ -4,11 +4,18 @@ describe('TabBarController', function() {
   beforeEach(function() {
     var tabEl = $('<div class="tabs"></div>');
     ctrl = new TabBarController({
-      tabBar: new TabBar({ el: tabEl.get(0) })
+      tabBar: new TabBar({ 
+        el: tabEl.get(0),
+        itemAdded: function(item) {
+        },
+        itemRemoved: function(item) {
+        }
+      })
     });
   })
 
   it('Should add Controllers', function() {
+    debugger;
     ctrl.addController({
       title: 'Item 1',
       icon: 'icon-home',
diff --git a/hacking/TabsAngular.unit.js b/hacking/TabsAngular.unit.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/hacking/nav.html b/hacking/nav.html
index a3dd32736d..2825c5a656 100644
--- a/hacking/nav.html
+++ b/hacking/nav.html
@@ -27,26 +27,38 @@
     <script>
       // Grab the sections
       var navBar = document.getElementById('nav-bar');
+      var cd = document.getElementById('content');
+
+      var View = function(opts) {
+        this.el = opts.el;
+      };
+      var content = new View({
+        el: cd
+      });
+
 
       var controller = function(opts) {
         this.el = opts.el;
       }
       controller.prototype = {
-        detach: function() {
-          //this.el.style.display = 'none';
-          var parentNode = this.el.parentNode;
-          if(!parentNode) {
-            return;
-          }
-          var next = this.el.nextSibling;
-          this._lastNodeSpot = next;
-          this._lastNodeParent = parentNode;
-          parentNode.removeChild(this.el);
-        },
-        attach: function() {
-          //this.el.style.display = 'block';
-          if(this._lastNodeSpot) {
-            this._lastNodeParent.insertBefore(this.el, this._lastNodeSpot);
+        visibilityChanged: function() {
+          if(this.isVisible) {
+            //this.el.style.display = 'block';
+            if(this._lastNodeSpot) {
+              this._lastNodeParent.insertBefore(this.el, this._lastNodeSpot);
+            } else {
+              content.el.appendChild(this.el);
+            }
+          } else {
+            //this.el.style.display = 'none';
+            var parentNode = this.el.parentNode;
+            if(!parentNode) {
+              return;
+            }
+            var next = this.el.nextSibling;
+            this._lastNodeSpot = next;
+            this._lastNodeParent = parentNode;
+            parentNode.removeChild(this.el);
           }
         }
       };
@@ -61,10 +73,6 @@
         return c;
       };
 
-      var View = function(opts) {
-        this.el = opts.el;
-      };
-
       var page1 = createPage('Home');
       var page2 = createPage('About');
       var page3 = createPage('Cats');
@@ -72,11 +80,6 @@
 
       var pages = [page1, page2, page3, page4];
 
-      var cd = document.getElementById('content');
-      var content = new View({
-        el: cd
-      });
-
       var c = new NavController({
         navBar: new NavBar({ el: navBar }),
         content: content