Client and service section nearly done