Getting to the point where we can auto-configure the client...