Update to grouping

Added a group listener, trying to make it play nice