Milestone 0.0.0.M2a
Prepare for next round of development