Moved a lot of stuff and added potentials