Added group. Added QUIT handling