Clear solution & added client connection processing

Clear solution & added client connection processing