WIP: Partial search functionality implemented