Added notes to the TODO