Switch to Groups

Switch coding to use groups rather than filters.