Most funcitonality working, pushing to Heroku