Works on search, testing remaining