updated classes to get rid of leader, add group