Final touches, now pushing to heroku