Added ToDo solution