Extending ToDo a little