First working vesion for Heroku