Changes login process
Adds work in progress login refactoring