Yes, I wanted to get this PR in and then abstract this out in a new PR.