Preliminary GROUP_BY enhancement

relates to #10