I'm going to add some more docs, as I get my head around 1.8