more work toward v0.8.0.0