Beginning work on search functionality