Use new container classes
Merge pull request #6 from guardian/comment-us-fix

Update comment-us with new classes