working post and prep for heroku
merged db