Refactoring, create ObservationSet? as the items that will be listed and searched for. Calibration now inherits from Observation which is a basic data object.