What's happening here? This looks nearly ready to merge but I don't think the tests are finished yet.