Update TODO list

Update the list of TODOs with the high level tasks needed to be completed for the next merge request