Doing a full commit in preparation for changing a bunch
of stuff. Beyond this I'll be reworking a lot of things.