Milestone 1

Finished with milestone 1