make this stuff heroku ready