Updated to new OAuth2.0, completely redid client