I don't get why this doesn't produce a conflict vs David's mega message code refactor. Perhaps this module got missed in the refactor?