Updated TODO and Pods