Shifting the Focus: A Heterogeneous Disease in a Heterogeneous Population