More plugin work.. adding queues