Progressing on the heroku master + staging