bunch of stuff
merge