Added queue.  Cleanup.