Move stuff around and add some more stuff