Adding some infection calculation

Point of origin is still incomplete.  Infection calculation is subject
to change.