Adding tokenizer

Not freeing memory correctly. Commands stick around.