more stuff
Merge https://github.com/letsleaveitempty/sharing_is_caring