Making it Heroku ready