One of these days we'll get this Heroku port sorted