Working on fixing server client