Added more client code, code is broke at the moment