Do matching on ticks instead of when entering the queue, this is a prerequisite for #2