refactoring to use the queue asset, wip