CreditCardInfo and the like
the merge is complete