Thanks Jack.  Once you do that, I'll rebase this PR on top of that.