Tokenizer just created, need some enhancements