DJ and I sat down this morning and did a pairwise code review of his patch set. The functionally things look cool. My requests for changes have to do with adding more comments and transforming literal strings/integers into constants which have been discussed in detail during our code review. So he is going to withdraw his PR and amend things a bit and resubmit.
--Tom