Added basic finding functionality