I thought something like this should work, testing on compressor

This is what I had in mind. Made a PR to get a nice diff and some email notifications.