Surfing will make its Olympics debut at Tokyo, as the Games organisers try to attract a younger audience.
But the seeds to surfing's introduction were sown back at Stockholm 1912, when Duke Kahanamoku from Hawaii - a pioneer of modern surfing - won three swimming gold medals for the United States and expressed his hope the sport would one day be added to the programme.
Some of the sport's biggest names will contest the men's and women's events at Tsurigasaki Beach, including Americans John John Florence and Kelly Slater, and Aussies Mick Fanning and Stephanie Gilmore.
Ella Williams has staved off Paige Hareb to claim the NZ women's berth, while Billy Stairmand will carry the flag for the Kiwi men.
Billy Stairmand - men's shortboard
Ella Williams - women's shortboard