Feature/club 1092 vouchers

It's not wrong per se I guess, but it would be a cleaner and more robust way to deal with historical data.