Conversion Pt.2

Done with converting, just need to make sure things run smoothly (which
they don't...)