Moved some stuff around
Stuff done