Documentation/cleanup
Implement basic group handling