Added full search functionality; no tests yet