Add "Message" module to accept generic message callbacks.
get rid of return