@rwillmer. If this approach makes sense to you, I can make the change in my branch this morning. My PR already incorporates all other changes from this PR