Pushing working version

Ran several tests on heroku