Added some TODOs

Added some TODOs