Still more work to do, but it's a start.