Closes #65 - Kick off 2.0.0-m1 development