Refactors and adding pathogen