bunch of stuff
merged