restructured queues so that theres no more passing using a static class