I take back my last commit, it worked for one glorious set of tests and then failed immediately thereafter; now it actually works (not finished, though)