WIP
Had to remove all delayed jobs stuff because of heroku