Initial build - working perfectly for single queue