Major update/overhaul of several systems.  Should be the final commit.