Group classes and Activities added, linking to be done