build client side communications
fix client
merge