Attempt at getting groups and members working
fixed conflicts