Add first pass of new queue architecture.