Sign in as local user now working
More refactoring to support Connect