Some TODOs added