Refactored async resolver code flow

garbage