Converter refactor, first pass
- WIP