started work on the tokenizer again