Client server v2

Version 2 of the client server API.