working on adding queueing logic