This ties all the new parts together now, shrinking the extractor engine considerably once the old code is removed.