Added notes to TODO