formatted a bunch of shit
oops forgot that was in there
fucking merge