added queues
Merge branch 'adding_queues'