further progress with queue handling