cosmetic changes :)
started to client implementation