commits from work with @lloydwatkin

Now to write out in long-form