fixup! fixup! Add ability to use groups