Ongoing development of 2.0.0