Rework conversions and lots of stuff