Groups part 2

more groups stuff done. will finish tomorrow