Added important TODOs