move firewall to firewall formula
Merge pull request #1 from ministryofjustice/firewall-refactor

move firewall to firewall formula

This means our public formulas don't depend upon a state in a private formula.