WIP: Upgrades to remove some weird constants etc...........