Quickie refactor
Implemented group(), fixes #2