updated TODO for this branch