Updating todo-list with feedback from Eric