More work on queue manager and other parts.