         newViewController.view.autoresizingMask = .FlexibleHeight | .FlexibleWidth
     }
 
-// MARK: - Private
-
-    private func setupStyles() {
-        scrollView.backgroundColor = UIColor.grey3()
-        view.backgroundColor = UIColor.grey3()
-        view.setNeedsDisplay()
-        joinButton.backgroundColor = UIColor.greyA()
-        signInButton.backgroundColor = UIColor.blackColor()
-    }
-
-    private func checkIfLoggedIn() {
-        let authToken = AuthToken()
-        if authToken.isValid {
-            self.loadCurrentUser()
-        }
-        else {
-            let authService = AuthService()
-            authService.reAuthenticate({
-                self.loadCurrentUser()
-            },
-            failure: { (_,_) in
-                self.showButtons()
-            })
-        }
-    }
-
-    private func loadCurrentUser() {
-        let profileService = ProfileService()
-        profileService.loadCurrentUser({ (user, responseConfig) in
-            self.showMainScreen(user, responseConfig: responseConfig)
-        }, failure: { error in
-            self.failedToLoadCurrentUser()
-        })
-
-        //TODO: Need to get failure back to AppViewController when loading the current user fails
-    }
-
-    private func showButtons() {
-        UIView.animateWithDuration(0.2) {
-            self.joinButton.alpha = 1.0
-            self.signInButton.alpha = 1.0
-        }
-    }
-
-    private func setupNotificationObservers() {
-        let center = NSNotificationCenter.defaultCenter()
-        center.addObserver(self, selector: Selector("userLoggedOut:"), name: Notifications.UserLoggedOut.rawValue, object: nil)
-        center.addObserver(self, selector: Selector("systemLoggedOut:"), name: Notifications.SystemLoggedOut.rawValue, object: nil)
-    }
-
-    private func removeNotificationObservers() {
-        let center = NSNotificationCenter.defaultCenter()
-        center.removeObserver(self)
-    }
-
-    func failedToLoadCurrentUser() {
-        let authToken = AuthToken()
-        authToken.reset()
-        showButtons()
-    }
+}
+
+
+// MARK: Logout events
+extension AppViewController {
 
     @objc
     func userLoggedOut(notification: NSNotification) {

        return UIStoryboard.storyboardWithId(.Landing) as! AppViewController
    }

    public func showJoinScreen() {
        let joinController = JoinViewController()
        joinController.parentAppController = self


    public func showMainScreen(user: User, responseConfig: ResponseConfig) {
        Tracker.sharedTracker.identify(user)

        var vc = ElloTabBarController.instantiateFromStoryboard()
        vc.setProfileData(user, responseConfig: responseConfig)
        self.swapViewController(vc) {
