search-core code complete; need test