Added Groups

Fixes #20