merged in Keith's tests and methods for criteria searching.