#1312 More refactor, code now handles enqueuing if config active