Corruption proofing - stage 5

Content to come