Some new stuff, not really heroku specific anymore