Added more to the ToDo