added groups
merge conflict
fixed shans terrible merge