Updated TODO. I knew I'd miss something