Refactor client side. Fix wire.