Some TODOs for next scopes of work.