Better tokenizer, added unfinished classifier