--Fixed up belongs to and has_many associations