Squashed some bugs
Merge branch 'Shared' of https://github.com/harlanhowe/RelationshipsJJD.git into Shared