Adding preliminary search functionality