It looks like we could be watching our favourite athletes turn into Olympians!
Tokyo has chosen skateboarding, surfing and climbing among the sports recommended for the 2020 Olympic Games.
The sports, joined by baseball and karate have been chosen from a list of 26, as the new options.
We're definitely in the mood to see some of our favourite boarders and climbers alongside the current Olympians in five years!
The sports were chosen as the most likely to bring higher ratings and boost sponsorship in the next games, hosted by the country.
"This package of events represents both traditional and emerging, youth-focused events, all of which are popular both in Japan and internationally" said a statement released by the organising committee.
Can you imagine tuning in to see Coco Ho against Sally Fitzgibbons?
The controlled waves at Surf Snowdonia have shown that the sport can be controlled for Olympic standards.
Skateboarding however, is the most popular urban sport in Japan and is therefore pegged as a favourite.
Can you imagine tuning in to see Coco Ho against Sally Fitzgibbons? Leticia Bufoni against Lizzie Armanto?
Let's keep our fingers crossed and look forward to the raddest Olympic games in history!