GroupRun first pass and removed all intellij warnings.