Refactoring to allow for receive qualifiers.  Still need to implement qualifier tests.