Updated ToDo and added some planning for future work items.