Continued work on Groups controller