Adding some TODOs