Messaging

What changed
============

* Logging for return message
* Moved handling of messages to separate classes