diff --git a/ionic/components/app/test/sink/index.js b/ionic/components/app/test/sink/index.js
index 3e7d72e68e..f9bc3908bb 100644
--- a/ionic/components/app/test/sink/index.js
+++ b/ionic/components/app/test/sink/index.js
@@ -1,6 +1,6 @@
 import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations';
 
-import {IonicView} from 'ionic/ionic';
+import {IonicView, Register, Registry} from 'ionic/ionic';
 
 import {ButtonPage} from './pages/button'
 import {NavPage} from './pages/nav'
@@ -22,7 +22,8 @@ import {ModalPage} from './pages/modal'
   selector: 'ion-app',
 })
 @IonicView({
-  templateUrl: 'main.html'
+  templateUrl: 'main.html',
+  directives: [Register]
 })
 class IonicApp {
   constructor() {
@@ -49,7 +50,8 @@ class IonicApp {
   openPage(aside, component) {
     aside.close();
 
-    window.nav.setItems([component.component]);
+    let nav = Registry.get('myNav');
+    nav.setItems([component.component]);
   }
 }
 
diff --git a/ionic/components/app/test/sink/main.html b/ionic/components/app/test/sink/main.html
index c053da3c12..7bc27fb2f3 100644
--- a/ionic/components/app/test/sink/main.html
+++ b/ionic/components/app/test/sink/main.html
@@ -11,7 +11,7 @@
   </ion-content>
 </ion-aside>
 
-<ion-nav #content [root]="rootView"></ion-nav>
+<ion-nav #content [root]="rootView" [register]="content" register-id="myNav"></ion-nav>
 
 <style>
 my-modal {
diff --git a/ionic/components/app/test/sink/pages/button.js b/ionic/components/app/test/sink/pages/button.js
index 52fa858b26..eee8f52ace 100644
--- a/ionic/components/app/test/sink/pages/button.js
+++ b/ionic/components/app/test/sink/pages/button.js
@@ -43,7 +43,6 @@ import {Routable, NavbarTemplate, Navbar, NavController, Content} from 'ionic/io
 export class ButtonPage {
   constructor(nav: NavController) {
     this.nav = nav;
-    window.nav = nav;
   }
 
   onButtonClick(event) {
diff --git a/ionic/components/app/test/sink/pages/search-bar.js b/ionic/components/app/test/sink/pages/search-bar.js
index 8918b04743..1c1754a673 100644
--- a/ionic/components/app/test/sink/pages/search-bar.js
+++ b/ionic/components/app/test/sink/pages/search-bar.js
@@ -7,7 +7,6 @@ import {FormBuilder, Validators, formDirectives, ControlGroup} from 'angular2/fo
 import {Segment, SegmentButton, SearchBar, List, Item, ActionMenu, Modal, ModalRef,
   NavbarTemplate, Navbar, NavController, Content} from 'ionic/ionic';
 
-  console.log(NavbarTemplate, Navbar, Content, formDirectives);
 
 @Component({
   selector: 'ion-view',
diff --git a/ionic/ionic.js b/ionic/ionic.js
index 7fd614721b..203189ac70 100644
--- a/ionic/ionic.js
+++ b/ionic/ionic.js
@@ -3,6 +3,8 @@ export * from 'ionic/config/config'
 export * from 'ionic/config/component'
 export * from 'ionic/config/ionic-view'
 
+export * from 'ionic/registry'
+
 export * from 'ionic/components'
 
 export * from 'ionic/platform/platform'
diff --git a/ionic/registry.js b/ionic/registry.js
new file mode 100644
index 0000000000..2f3253690b
--- /dev/null
+++ b/ionic/registry.js
@@ -0,0 +1,49 @@
+import {ElementRef, For, Parent, onInit} from 'angular2/angular2'
+import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations';
+import {View} from 'angular2/src/core/annotations_impl/view';
+import {Ancestor, Self} from 'angular2/src/core/annotations_impl/visibility';
+import {Type} from 'angular2/src/facade/lang';
+
+import {FormBuilder, Validators, FormDirectives, ControlGroup} from 'angular2/forms';
+import {Log} from 'ionic/util'
+
+import {ViewController, Nav} from 'ionic/ionic'
+
+
+@Directive({
+  selector: '[register]',
+  properties: [
+    'register',
+    'registerId: register-id'
+  ],
+  host: {
+    '[register-id]': 'registerId'
+  },
+  lifecycle: [onInit]
+})
+export class Register {
+  constructor() {
+  }
+  onInit() {
+    console.log('Register on init', this.register, this.registerId);
+    Registry.register(this.registerId, this.register);
+  }
+}
+
+class RegistryManager {
+  constructor() {
+    this.components = {};
+  }
+  register(key, component) {
+    this.components[key] = component;
+    console.log('Registered', this.components);
+    // TODO(mlynch): We need to track the lifecycle of this component to remove it
+  }
+  get(key) {
+    return this.components[key];
+  }
+}
+
+var Registry = new RegistryManager();
+
+export {Registry};