Add new token types

I am starting to implement new token types outlined in the project specs.