refactor
roadblock..
most tests are working again
all tests passing with new token api
Merge pull request #2 from grammarjs/refactor

refactor