broke stuff

and added stuff
merge