[WIP] Improved client side integration

@jameshalsall Updated now.