moved MailboxFactory up a level