WIP, now with even more tests.