Add debug notes to TODO