[ISSUE-2] Todos notes