made the switch to a queue, need comments still