Milestone 3

Files for milestone 3