organized handlers and began classes for managing remote conflicts