Progress on encrypt-for-all feature, squash me later