Support for wrap and group transformations

Opening early for discussion ....