Reorganizing.
More async handling with empty handlers.