More detailed tokenizer, a few kinks to work out. Going out for dinner.