Updated TODO list for stuff needed in 2.0 and 2.1