Some changes to tidy up sharing features from gh-pages branch
Re-add all the sharing features. Totally screwed that one up