Better Tokenizer Final 04

Really should work this time.