Attempting to reconcile some minor issues, still trying to get this to work on Heroku