@jvlcek I've built my other PR off of this PR, and I've added a spec similar to what you've suggested there.  I am going to close this PR and open a new one which will include this commit plus the other changes I mentioned.