Milestone 1

Finished code for milestone 1