Is this TODO coming as part of an update to this PR or do we only need it later?