Added Parser and changes to Token and TokenType