Modify client to use new server commands.  Not debugged yet.