A bunch of conversion WIP - committing to not lose it