refactored extractor data model.  Local only.  Cluster version is not functional
Merge master