Switched to -belongs_to, -has association, passes unit tests