about to get rid of the GroupExpression.
group tests passing again: still needs a lot of refactoring.