Initial set of changes including a Token and TokenReader class.