add a shit ton of things
merge