Preparing for final deploy to Heroku