adds a bunch of broken shit
revert to bb93fa4