heres lots of things
fuck merge conflicts