Disease extent parameters

Pull request combines stories 217 (first 4 commits) and 215
Woops no... I will improve this test!