@drapergeek I'll pull this line out of this pull request and submit as a separate pull to discuss there.