Upload updates

Build on the upgrade_to branch, which is still unmerged as well.
I think we probably want to include the version we just tried to upgrade to