crap commit that breaks tests without fixing them
big merge of blargh