Update measurement list to queues

Removing items from the start of lists is inefficient