More tying up of certificate of membership stuff in the client.