add more finder logic to main()