Reorg and track tokens
Merge pull request #1 from jgn/jn-save_tokens

Reorg and track tokens