Did some work on actual upgrade system