Should only be in whc-branch

I think this looks good. Here's a comment.