Frequency group experiment added, refactorings