Major work toward v1.0.0