Sadly I did this all once (and more completely) but then lost the commit. So this is a re-do. The sharing demo stuff isn't yet complete. Updates #1658 etc
Brad Fitzpatrick