- Split out affinely mapped groups
- p refinement
