prelim work on #213 for the server code
prelim work on #213 for client code