tokenization now working. Escape chars in progress