Starting to add service classes for Picnic.