Refactor around loading but mostly to acommodate refresh token and logging in after refresh