Fleshed out except upgrading section and links