Added some TODOs in the code