This is the code we walked -- take a look and merge if you don't see an issue.