Oh, and TheMue's ServiceUnitsWatcher will need some reworking in the light of the big branch, just like my ServiceRelationsWatcher, but I'm more than happy to take that on myself assuming it gets merged first. Cheers William