Some cleaning up and enable creating groups instead of erroring out.

[VidathD]

So I couldn't actually test this because I don't have the resources to spin up multiple windows VMs rn. But should work...