Make progress, but tests are failing.