Added some TODOs in comments