Updated TODO with some notes and remarks