Final version- not uplaoding to heroku bug