Update groups

@phlco -- check the diffs... some small things, but mostly adds "<n> groups as a choice"

This was a learning experience.