added some new TODOs