Updated TODO for more info