Lots more work on the testing and revamp.