Feature/group management

Just adding some lightweight logic to make migrating easier until we have the time to properly overhaul the way that groups are done