Start replacing the conversion logic

Remove most of the old stuff; initial hook into the new stuff