Tidy up, looking good.

Now how to acknowledge all groups when configured groupid=0