Generated 20 year checkpoint

(which required implementing Serializable in some classes)
Updates to CombinationPrevention for demographics
Intervention updates