First non-refactored version of some of the associations