keep the existing code paths working

this keeps all of our existing code paths working, while I get the SubscriptionSet pattern finalized