Amend and organize TODO