Started refining the inbox controller to use the InboxFactory instead