Updated TODO to match current state