refactored buildQueue + fetch async