Groups implemented, with UI integration