Use an overwrite and a non-overwrite queue
Better stopping system
Fixed the tests
where I got to
Merge branch 'master' into Abr_more_clever_ingest