Implementation real Client

Almost finished...
+ removed some returned references