Major work towards v1.0.