This looks like the same file as PR #15. Want to get #15 merged into master and rebased into this branch, then ask for another review on this one? I'd expect this file will be gone at that point.