Moving to tokenize

Tests pass.  Some of the stuff I changed might need refactoring.
I agree.  There were some tests that I forgot to change after we clarified that all string values will be double quoted.