Updated TODO during meeting
Merged