Re-did migrations to use has_many :through with separate model
Update models to reflect the new relationships