Part of the refactor involving the implementation of separated Client and Server Event handlers and handler adapters. This refactor is not complete and needs to be continued.