CHG: Preparing for heroku