Did additional work on new ingest framework