Some more work; we got a ways to go