refactoring relationships to be hopefully more clear, also keep reference to the relationship on the model