Milestone 0.0.0.M4
Prepare for next round of development