Complete first phase of first draft of changes to ingest config