Added 'discovery' code for server handlers - still needs some debug/messaging work