Lots more work, getting close to done