Almost ready for heroku