@vtjnash As soon as we address this comment, I'll rebase and be ready to merge this.