Initial Contributions

First version of grouping.