Starting lookup - reworking client search to reuse code