Added quick and dirty client