starting to add token class and tests