ugh github overwrote stuff again. i think i fixed it