Work
Recode added to Tokenizer

Streamline shaped stuff