Base controller

Pull most up to date base controller into most up to date nav stack work.