Changes for HealthMap

I suggest looking at the whole thing rather than individual commits (it's been through a few iterations).