WIP - Improvements to groups