Updated TODO list in order of need