Started to add Logout logic