Work in progress on v2.0.0