Model Associations

Updated models to incorporate associations