Milestone 0.0.0.M3
Prepare for next round of development