Moved authentication out of the client.
Merge branch 'temp' into feature/connor/oauth2