Upgrades! Upgrades! Upgraaaades!

Upgrade functionality is all in and "just" needs to be tested tomorrow.