Minor refactoring, started to add upgrades.