broke a bunch of stuff, added more broken stuff