JohnG. Add a couple more mixins.