add shell tools and grouping