more work toward v0.5.0