Working for making groups optional. Still WIP not ready for testing or prod.