Is this question for @chrisndodge? Looks like something that needs to be understood before the PR is merged.