These group related functions will need to change once #1575 gets merged (which should be this morning, I hope)