Almost done tutorial and upgradestate