Rebased group basic

Rebased version of #231