Changed a lot of things around

Bad commit text, but I lost track