Fixed DB relationships, Preparing for Heroku