merge templates
drop groupby.tpl
finish it