first pass of the client commit