Still looking at the internal project.  This PR is strictly for OSS thorax.  Obviously we don't want to pull this in until we test the internal project but I wanted to get this PR out there for review.