dealt with items on the TODO list