Stuff

moved some stuff around