Working on Heroku integration