heroku-ready almost