Queue first refactor done