Tokenizer 1.0 - and more files to check