Completed integration of first draft of new ingest config code