Initial work towards search feature