Closes #74 - Kick off 2.0.0-m2 development