Updated to include disease implementation (not yet complete)