Refactoring ingest tasks.
Oops.