Continued work on tokenizer. Updated TODO on that file.