Disease extent parameters

Pull request combines stories 217 (first 4 commits) and 215
Just so Laurence is aware, my batching story will make this asynchronous so this is OK for now.