More work (in progress) on new ingest/harvest framework