Collision masking & groups, closes #33