queues refactored with controller
conflict fix