Added 2 new TODOs