Add shell search class...