beginning to setup for enabling a client adapter
more refactoring, prep for non-server interfaces