Add some TODO notes from code review