Working on dispatch message management, relates to issue #23.