Ongoing development of 2.0.0
Ongoing refactor for 2.0.0