Added considerable more group stuff.