refactor and cleanup
complete sequence of requests from login click on client through data returned
resolve merge conflict
Merge pull request #100 from atungare/dev

Separate flow of data on first vs subsequent logins