Better Tokenizer Complete

Better Tokenizer completed. Requires testing.