Lots of server and client testing and changes to enable both to work.