Updated TODO's agian