massive asynchronous refactor