Edits to What still needs to happen.
Merges remote updates.