Added Associations and ready for heroku deploy