Updated TODO portions