auto add queues + refactors