merging parts of my dev branch for heroku push