Milestone3

First version of Milestone3