TODO list and commenting