Edits to What still needs to be done.