Updated for deployment to Heroku take three