Started changes for relationship system
Finished first version of relationship system
Merge branch 'relationship-changes'