edits

milestone 6 and 7