Updated TODO to reflect recent changes