Functionalized the queue a bit