Moving to tokenize

Tests pass.  Some of the stuff I changed might need refactoring.
@bifodus should the value here have double quotes?