Begin transitioning to PKCS #7. Still not complete though.