More progress toward v0.1