We cloned a bunch of code here, do you think you could make a TODO() to refactor this with the places that also clone it? Maybe the refactor could closely follow this checkin?