Milestone 0.0.0.M5
Prepare for next round of development