fix call to Guests
Start adding support for groups