Does the narrative in the PR description cover this TODO?