Added to GroupPicker

Now has infinate loop - fix asap!