Updated TODO's