all tests now pass, except for the new features we want to ship