Removing griswold dependency.  Adding search functionality