Tokenizer seems to work. need to do a lot of cleanup