Work on the new upgrade system, specifically with GUI changes