Finished the major changes to the upgrade system