Added some TODOs