Disease extent parameters

Pull request combines stories 217 (first 4 commits) and 215
Can this be added to equals and hashcode? (i.e. regenerate them)