Finished new CFRSwap operator proposal. HR incomplete.