Bunch of changes trying to get this running on Heroku