added TODOs

finalized TODOs for feature request