removed unneeded complexity; updated to support discovering messages and clients on the server;