Adds Token class, updates Parser
Implements more Token methods