Added more of the tokenization code.