Moved heavy and light into grouping, fixes #4