Add in basic grouping support, for nested marks