The Date is Set: Michael Phelps' Fiancée Nicole Johnson Reveals Wedding Plans

Michael Phelps continues to grow his collection of gold medals, but the swimmer is still missing one important piece of hardware: a wedding ring!

The champion swimmer’s fiancée Nicole Johnson opened up about the pair’s wedding plans to Access Hollywood in Rio, Friday, revealing that their nuptials might happen sooner rather than later.

“We have a date,” Johnson, who was joined by Phelps’ mom Debbie, said. “It’ll be small and intimate for the wedding, and then we’re throwing a massive bash for everyone in the states.”

Johnson, who gave birth to the couple’s first child, son Boomer, 3 months ago, added, “We’re kinda getting things rolling, I’ve been planning as we’ve been leading up to [the Olympics].”

“So I think I have the wedding in order, and now it’s on to the party for the fun,” she added.

For more of PEOPLE’s Olympic coverage, pick up our collector’s edition, The Best of the Games, on sale now.

The former Miss California and Phelps, 31, got engaged in February 2015 after dating on-and-off since 2007. After splitting in late 2011, the couple rekindled their romance for good in 2014.

Of the will-they-won’t-they nature of the relationship, Johnson admitted to Access Hollywood that things haven’t always been easy.

Now, she assured, “We didn’t miss a beat, and we’re happy.”

And the 31-year-old has certainly earned Debbie’s approval, who said, “When [Phelps] called me and said ‘I’m getting back with Nicole,’ I said, 'Well, that’s where you should be.’ ”

Johnson said that Phelps has already taken to his role as a dad, as Debbie echoed, “He talks about he wants to be just the best dad he possibly could be.”

She added that Phelps told her of raising Boomer, “I want to do it right.”