WIP: adding upgrading