Transfer TODO logic to todoList