WIP: Refactor certificate agent and queue

Details to follow...
What does this mean?