WIP: Refactor certificate agent and queue

Details to follow...
Is the watch target special, or did you just like 'make watch' ?