so uhhhh... A lot of stuff changed. Probably not even worth trying to explain what happened between this commit and previous ones at this point. New hotness.