diff --git a/src/components/datetime/datetime.ts b/src/components/datetime/datetime.ts
index 1ed8e67137..796f762b44 100644
--- a/src/components/datetime/datetime.ts
+++ b/src/components/datetime/datetime.ts
@@ -8,7 +8,6 @@ import { Form } from '../../util/form';
 import { Item } from '../item/item';
 import { merge, isBlank, isPresent, isTrueProperty, isArray, isString } from '../../util/util';
 import { dateValueRange, renderDateTime, renderTextFormat, convertFormatToKey, getValueFromFormat, parseTemplate, parseDate, updateDate, DateTimeData, convertDataToISO, daysInMonth, dateSortValue, dateDataSortValue, LocaleData } from '../../util/datetime-util';
-import { NavController } from '../nav/nav-controller';
 
 export const DATETIME_VALUE_ACCESSOR = new Provider(
     NG_VALUE_ACCESSOR, {useExisting: forwardRef(() => DateTime), multi: true});
diff --git a/src/components/infinite-scroll/test/basic/index.ts b/src/components/infinite-scroll/test/basic/index.ts
index 14268d3fdd..729d9e764c 100644
--- a/src/components/infinite-scroll/test/basic/index.ts
+++ b/src/components/infinite-scroll/test/basic/index.ts
@@ -7,7 +7,7 @@ import {ionicBootstrap, InfiniteScroll, NavController} from '../../../../../src'
 })
 class E2EPage1 {
   @ViewChild(InfiniteScroll) infiniteScroll: InfiniteScroll;
-  items = [];
+  items: number[] = [];
   enabled: boolean = true;
 
   constructor(private nav: NavController) {
@@ -68,7 +68,7 @@ function getAsyncData(): Promise<any[]> {
   return new Promise(resolve => {
 
     setTimeout(() => {
-      let data = [];
+      let data: number[] = [];
       for (var i = 0; i < 30; i++) {
         data.push(i);
       }
diff --git a/src/components/item/test/groups/index.ts b/src/components/item/test/groups/index.ts
index 602d692cd5..9ea4809344 100644
--- a/src/components/item/test/groups/index.ts
+++ b/src/components/item/test/groups/index.ts
@@ -1,5 +1,5 @@
-import {Component} from '@angular/core';
-import {ionicBootstrap, NavController, NavParams} from '../../../../../src';
+import { Component } from '@angular/core';
+import { ionicBootstrap, NavController, NavParams } from '../../../../../src';
 
 
 @Component({
diff --git a/src/components/modal/test/basic/index.ts b/src/components/modal/test/basic/index.ts
index 141c5d54e7..33752896da 100644
--- a/src/components/modal/test/basic/index.ts
+++ b/src/components/modal/test/basic/index.ts
@@ -1,6 +1,6 @@
 import { Component, Injectable } from '@angular/core';
 
-import { ActionSheetController, Config, ionicBootstrap, ModalController, NavController, NavParams, PageTransition, Platform, TransitionOptions, ViewController } from '../../../../../src';
+import { ActionSheetController, App, Config, ionicBootstrap, ModalController, NavController, NavParams, PageTransition, Platform, TransitionOptions, ViewController } from '../../../../../src';
 
 
 @Injectable()
@@ -117,11 +117,11 @@ class E2EPage {
   `
 })
 class NavigableModal {
-  constructor(private navController:NavController) {
+  constructor(private nav: NavController) {
   }
 
   submit(){
-    this.navController.push(NavigableModal2);
+    this.nav.push(NavigableModal2);
   }
 }
 
@@ -376,7 +376,7 @@ class ContactUs {
 class ModalFirstPage {
 
   private items:any[];
-  constructor(private nav: NavController, private actionSheetCtrl: ActionSheetController) {
+  constructor(private nav: NavController, private app: App, private actionSheetCtrl: ActionSheetController) {
     this.items = [];
     for ( let i = 0; i < 50; i++ ){
       this.items.push({
@@ -393,7 +393,7 @@ class ModalFirstPage {
   }
 
   dismiss() {
-    this.nav.rootNav.pop();
+    this.app.getRootNav().pop();
   }
 
   ionViewLoaded(){
@@ -430,8 +430,8 @@ class ModalFirstPage {
             // overlays are added and removed from the root navigation
             // find the root navigation, and pop this alert
             // when the alert is done animating out, then pop off the modal
-            this.nav.rootNav.pop().then(() => {
-              this.nav.rootNav.pop();
+            this.app.getRootNav().pop().then(() => {
+              this.app.getRootNav().pop();
             });
 
             // by default an alert will dismiss itself
diff --git a/src/components/nav/test/basic/index.ts b/src/components/nav/test/basic/index.ts
index 2b675d2808..12b1645f14 100644
--- a/src/components/nav/test/basic/index.ts
+++ b/src/components/nav/test/basic/index.ts
@@ -1,6 +1,6 @@
 import { Component, ViewChild } from '@angular/core';
 import { NavController, AlertController, Content } from '../../../../../src';
-import { ionicBootstrap } from '../../../../../src';
+import { ionicBootstrap, App } from '../../../../../src';
 import { NavParams, ViewController } from '../../../../../src';;
 
 
@@ -148,6 +148,7 @@ class FirstPage {
 class FullPage {
   constructor(
     private nav: NavController,
+    private app: App,
     private alertCtrl: AlertController,
     private params: NavParams
   ) {}
@@ -184,8 +185,8 @@ class FullPage {
         // overlays are added and removed from the root navigation
         // ensure you using the root navigation, and pop this alert
         // when the alert is done animating out, then pop off the active page
-        this.nav.rootNav.pop().then(() => {
-          this.nav.rootNav.pop();
+        this.app.getRootNav().pop().then(() => {
+          this.app.getRootNav().pop();
         });
 
         // by default an alert will dismiss itself
diff --git a/src/components/nav/test/child-navs/index.ts b/src/components/nav/test/child-navs/index.ts
index ae12253bbb..f1af093062 100644
--- a/src/components/nav/test/child-navs/index.ts
+++ b/src/components/nav/test/child-navs/index.ts
@@ -1,5 +1,5 @@
-import {Component} from '@angular/core';
-import {ionicBootstrap, NavController} from '../../../../../src';
+import { Component} from '@angular/core';
+import { ionicBootstrap, NavController } from '../../../../../src';
 
 @Component({
   template: `<ion-nav [root]="root"></ion-nav>`,
@@ -29,11 +29,11 @@ ionicBootstrap(E2EApp);
 })
 class LandingPage{
 
-  constructor(private _navController: NavController){
+  constructor(private nav: NavController){
   }
 
   goToPage(){
-    this._navController.push(FirstPage);
+    this.nav.push(FirstPage);
   }
 }
 
diff --git a/src/components/nav/test/insert-views/index.ts b/src/components/nav/test/insert-views/index.ts
index e2a85e4c04..e0ba9b1356 100644
--- a/src/components/nav/test/insert-views/index.ts
+++ b/src/components/nav/test/insert-views/index.ts
@@ -1,5 +1,5 @@
-import {Component} from '@angular/core';
-import {ionicBootstrap, NavController} from '../../../../../src';
+import { Component} from '@angular/core';
+import { ionicBootstrap, NavController } from '../../../../../src';
 
 
 @Component({
diff --git a/src/components/nav/test/memory/index.ts b/src/components/nav/test/memory/index.ts
index d0af5d4555..232f982b91 100644
--- a/src/components/nav/test/memory/index.ts
+++ b/src/components/nav/test/memory/index.ts
@@ -1,5 +1,5 @@
-import {Component} from '@angular/core';
-import {ionicBootstrap, NavController} from '../../../../../src';
+import { Component} from '@angular/core';
+import { ionicBootstrap, NavController } from '../../../../../src';
 
 
 let delay = 100;
@@ -16,7 +16,7 @@ let count = 0;
   `
 })
 class Page1 {
-  tmr;
+  tmr: number;
 
   constructor(private nav: NavController) {}
 
@@ -50,7 +50,7 @@ class Page1 {
   `
 })
 class Page2 {
-  tmr;
+  tmr: number;
 
   constructor(private nav: NavController) {}
 
diff --git a/src/components/slides/test/intro/index.ts b/src/components/slides/test/intro/index.ts
index 7913afa37a..8b3b6fa4af 100644
--- a/src/components/slides/test/intro/index.ts
+++ b/src/components/slides/test/intro/index.ts
@@ -1,5 +1,5 @@
-import {Component} from '@angular/core';
-import {ionicBootstrap, NavController} from '../../../../../src';
+import { Component} from '@angular/core';
+import { ionicBootstrap, NavController } from '../../../../../src';
 
 
 @Component({
@@ -8,7 +8,7 @@ import {ionicBootstrap, NavController} from '../../../../../src';
 class IntroPage {
   continueText: string = "Skip";
   startingIndex: number = 1;
-  mySlideOptions;
+  mySlideOptions: any;
   showSlide: boolean = true;
 
   constructor(private nav: NavController) {
@@ -20,16 +20,16 @@ class IntroPage {
     };
   }
 
-  onSlideChanged(slider) {
-    console.log("Slide changed", slider);
+  onSlideChanged(slider: any) {
+    console.log('Slide changed', slider);
   }
 
-  onSlideChangeStart(slider) {
-    console.log("Slide change start", slider);
-    slider.isEnd ? this.continueText = "Continue" : this.continueText = "Skip";
+  onSlideChangeStart(slider: any) {
+    console.log('Slide change start', slider);
+    slider.isEnd ? this.continueText = 'Continue' : this.continueText = "Skip";
   }
 
-  onSlideMove(slider) {
+  onSlideMove(slider: any) {
     console.log("Slide move", slider);
   }
 
diff --git a/src/components/tabs/test/advanced/index.ts b/src/components/tabs/test/advanced/index.ts
index 84a24078c8..072831de21 100644
--- a/src/components/tabs/test/advanced/index.ts
+++ b/src/components/tabs/test/advanced/index.ts
@@ -1,6 +1,6 @@
 import { Component, ViewChild } from '@angular/core';
 
-import { ionicBootstrap, NavController, NavParams, ModalController, ViewController, Tabs, Tab } from '../../../../../src';
+import { App, ionicBootstrap, NavController, NavParams, ModalController, ViewController, Tabs, Tab } from '../../../../../src';
 
 
 @Component({
@@ -92,7 +92,7 @@ class TabsPage {
 class Tab1Page1 {
   userId: string;
 
-  constructor(private nav: NavController, private tabs: Tabs, private params: NavParams) {
+  constructor(private nav: NavController, private app: App, private tabs: Tabs, private params: NavParams) {
     this.userId = params.get('userId');
   }
 
@@ -102,7 +102,7 @@ class Tab1Page1 {
 
   goBack() {
     console.log('go back begin');
-    this.nav.pop().then((val) => {
+    this.nav.pop().then((val: any) => {
       console.log('go back completed', val);
     });;
   }
@@ -112,7 +112,7 @@ class Tab1Page1 {
   }
 
   logout() {
-    this.nav.rootNav.setRoot(SignIn, null, { animate: true, direction: 'back' });
+    this.app.getRootNav().setRoot(SignIn, null, { animate: true, direction: 'back' });
   }
 
   ionViewWillEnter() {
@@ -323,10 +323,8 @@ class Tab3Page1 {
 
 
 @Component({
-  template: '<ion-nav [root]="root" swipeBackEnabled="false"></ion-nav>'
+  template: '<ion-nav swipeBackEnabled="false"></ion-nav>'
 })
-class E2EApp {
-  root = SignIn;
-}
+class E2EApp {}
 
 ionicBootstrap(E2EApp);
diff --git a/src/components/tabs/test/basic/index.ts b/src/components/tabs/test/basic/index.ts
index 03428939db..ded7adb258 100644
--- a/src/components/tabs/test/basic/index.ts
+++ b/src/components/tabs/test/basic/index.ts
@@ -1,5 +1,5 @@
-import {Component} from '@angular/core';
-import {ionicBootstrap, NavController, App, AlertController, ModalController, ViewController, Tab, Tabs} from '../../../../../src';
+import { Component} from '@angular/core';
+import { ionicBootstrap, App, AlertController, ModalController, ViewController, Tab, Tabs } from '../../../../../src';
 
 //
 // Modal
diff --git a/src/components/tabs/test/child-navs/index.ts b/src/components/tabs/test/child-navs/index.ts
index d24c27f87a..ae9239bf0b 100644
--- a/src/components/tabs/test/child-navs/index.ts
+++ b/src/components/tabs/test/child-navs/index.ts
@@ -1,5 +1,5 @@
-import {Component} from '@angular/core';
-import {ionicBootstrap, NavController, App, Alert, Modal, ViewController, Tab, Tabs} from '../../../../../src';
+import { Component } from '@angular/core';
+import { ionicBootstrap, NavController, App, Alert, Modal, ViewController, Tab, Tabs } from '../../../../../src';
 
 
 //
diff --git a/src/components/toast/toast-component.ts b/src/components/toast/toast-component.ts
index 34852212a4..150a4babad 100644
--- a/src/components/toast/toast-component.ts
+++ b/src/components/toast/toast-component.ts
@@ -4,7 +4,6 @@ import { NgIf } from '@angular/common';
 import { Animation } from '../../animations/animation';
 import { Config } from '../../config/config';
 import { isPresent } from '../../util/util';
-import { NavController } from '../nav/nav-controller';
 import { NavParams } from '../nav/nav-params';
 import { Transition, TransitionOptions } from '../../transitions/transition';
 import { ViewController } from '../nav/view-controller';
@@ -44,7 +43,6 @@ export class ToastCmp implements AfterViewInit {
   private id: number;
 
   constructor(
-    private _nav: NavController,
     private _viewCtrl: ViewController,
     private _config: Config,
     private _elementRef: ElementRef,