Continue reworking of ingest API

This code is not quite right; it is possibly to get a never-ending ingest job again, i.e., one with a "stuck" ingest task. However, I am checking in anyway to facilitate work by other team members while I get this sorted out.