Added notes to the TODO. Matt, please check and modify TODO as required :)