Major edits to the todo list