Finally adding all client code