More refactoring; more direct Grouper interaction