      */
     override protected function restoreApplicationState():void
     {
-        // TODO (chiedozi): Figure out how to refactor this into base class
+        // TODO (chiedozi): Figure out how to refactor this into base class.  Need navigator
+        // to be a part of the base class
         super.restoreApplicationState();
         
         var savedState:Object = persistenceManager.getProperty("navigatorState");

    /**
     *  @private
     */  
    override public function get exitApplicationOnBackKey():Boolean
    {
        if (viewMenuOpen)
            return false;

    /**
     *  @private
     */
    private function get navigationStack():NavigationStack
    {
        if (navigator)
