reverted a bunch of my changes because db was freaking out