Progress on LoggedIn
Should be good for presentation
Merge branch 'Task-770' into develop