Watch: Michael Phelps Fiancé Reveals Wedding Plans

While Michael Phelps is adding to his massive collection of gold medals, his fiancé Nicole Johnson is busy planning their upcoming nuptials.

“We have a date,” Johnson said, according to PEOPLE. “It’ll be small and intimate for the wedding, and then we’re throwing a massive bash for everyone in the states.”

It sounds like the two may be tying the knot sooner rather than later. Perhaps while they’re in Rio for the games? Johnson didn’t give many more direct details about the event, only that she was “kind of getting things rolling” and that she’s “been planning as [they’ve] been leading up to [the Olympics].”

Phelps and Johnson have been together on and off since 2007. They split for a while from 2011 to 2014. When Phelps told his mother that in 2014 he was planning on getting back together with Johnson, she said, “Well, that’s where you should be.”

The two welcomed their son, Boomer, about three months ago. So the couple has been pretty busy, Johnson planning the wedding, Phelps training for the Olympics and both tackling everything that comes with being first time parents. Luckily for Boomer, Phelps is committed to being the “best dad he possibly could be,” according to his grandmother Debbie.

We are looking forward to hearing about the couple’s big day!