Pull Ben's work into a traits branch

So far I've been working on a fork of gemdata but now I have direct access I might as well use that.

:beer: 

Creating a separate branch to track the traits work, don't want to accidentally break a deployment.