Moving to tokenize

Tests pass.  Some of the stuff I changed might need refactoring.
@bifodus we may want to move this into `utils`.  That way `read-and-parse` and this file can reuse the same function.  Thoughts?