Started implementing Entity Groups