refactored relationships between models a little