is this still a TODO? if so is it OK to leave it outside the scope of this PR?