Work in progress
More work on login process