Feature/club 472

DO not Merge
Still miss the payout (even if the code it's in place)