Final commit, Messaging working on heroku