Milestone 6-7

Almost done with milestone 6