Integrated client side

Please merge this integration