Add more notes to TODO