Fixing async problems.
Working on OAuth2.