Initial work to make groups optional