Refactor to be a queue.