This is homework edits up until 9-24