Organizing upgrades, adding a few