Merging my MQ listener code with Jonas's, needs testing on sifd-hydra next