Pushing off from mike's
Merge branch 'master' of https://github.com/frankenbeanies/privacy