Recipient architecture almost done