Feature/club 97