clean up, and add another task to "todo"