Add figureGroup class;
restore functionality, aggregating