Evidence Rework

Numerous changes to the evidence module.