Updated ToDo, now merging into master branch.