Edits

milestone 4 and part of 5