initial search implementation - refs #17
merge conflict