Feature/club 679