Debugged, and prepping for heroku deployment