Huge commit with a bunch of stuff not vc, I suck at git