Finished edits for HW4 first submission