Ok, so this doesn’t fully work. It catches some but not all and toggling is sometimes required. Back to the drawing board.