Added some more TODOs