Straighting up and adding in stuff