Tinkered with the search, needs more work