Cleaned up, Tokenizer pretty much done