Added TokenType stuff
For real this time