Disease rewrite
Continued rewrite of disease.cpp