added needed functionality in tokenmanager and started factoring parsers (take two)