Added initial basic search functionality