Work on making ingest more general