Edits and initial code