okay, i know we abuse git a lot but this is probably the biggest abuse
we've done. this commit has lots of stuff that does lots of good stuff
but i've totally forgotten what's in it. BIG UPDATE YEAH