Issue #23 - message system added