Added some new TODOs