More upgradable stuff, infrastructure, adding items.

Just another wave of commits cleaning up behind myself, mostly, tons of
progress all around, but still far from finished.