New/milestone1

Milestones 1 and 3 done