Add group names, which will allow for mixtures. Also add some assertion errors