Multiple queues working, but needs refactor