Fixed up some client code. Prepare for more. = P.