Updated TODO Comments