This moves the finder logic out of the component