Update to include tokens, and update readme.md