Slowly starting to switch over.

Still working through the conversion. A lot of things need to be set up
and I'm going back and forth on how best to approach things.