Starting to implement searching logic