WIP: Refactor certificate agent and queue

Details to follow...
Blergh, thanks!