WIP: Start mocking up tokenization

So far I"ve made more mess than I"ve fixed.