first stage of refactoring to use acccess_token.