PFS ACG work

I hope this PR works right. It seems to already have two PR's from SecretWizard embedded in it. I hope this doesn't undo a previous PR.