Added some simpler TODOs