Added a todo list so we know what is remaining