did a lot of stuff
merged