Group by support

Added simple group by support. No tests yet