Checkpoint prior adding sign-in-out functionality
Finish sign in
Pre merge with master