Prepped up for heroku deployment