heroku ready
Working Version
better version