Token, TokenType class is filled, add TODO for extract method
Added error classes and fixes errors for now
Merge pull request #1 from dtangster/test1

Test1