He went for the gold, but she’s thinking about white! Michael Phelps and his fiancée, Nicole Johnson, are undoubtedly ecstatic about the swimmer winning his 22nd gold medal at the Rio Summer Olympics on Thursday, August 11. But Johnson revealed that they’re also thinking about another big milestone: their wedding, set to happen at the end of this year.

“We have a date,” the former Miss California, 31, told Access Hollywood while sitting next to Michael’s mom, Deborah Phelps. “It’ll be small and intimate for the wedding, and then we’re throwing a massive bash for everyone in the states. We’re kind of getting things rolling. I’ve been planning as we’ve been leading up to this. I think I have the wedding in order. Now it’s onto the party for the fun!”

Phelps, 31, popped the question to his on-off girlfriend of eight years in February 2015, announcing the exciting news in an Instagram where the happy couple rolled around in the snow. “She said yes😁😁😁,” he wrote on February 22, 2015. She also confirmed the engagement in a separate post, where her massive sparkling engagement ring was visible. “I’m gonna be a Mrs. 🙊🙈 @m_phelps00 💍❤️,” she captioned.

The two have already made strides in starting a family. Johnson gave birth to their son, Boomer Robert Phelps, on May 5. And at three months old, Boomer’s stealing the spotlight from daddy in Rio with his adorable game face and social media shout-outs.

Although they seem picture-perfect now, Johnson admitted that at a time, they were both unsure on their future. “I’m pretty sure we both shared stuff with our parents that we were like, ‘Yeah, this is it. There’s no way we’re getting back together,’” she continued. “When we finally did, it was still a little rocky in figuring things out and figuring each other out because it had been some time, but we didn’t miss a beat. We’re happy. We have been back together ever since we got back together this last go round. Now we have a little one, a wedding at the end of this year. We’ve got a lot of fun.”

And it turns out that mama always knew best. Deborah assures us that she has always been Johnson’s number-one fan. “They had to figure it out themselves, and they had to mature,” she noted. “Our men have to go through phases in their lives where they want to see what they can do and who they can be with.…When he called me and he said, ‘I’m getting back with Nicole,’ I said, ‘And that’s where you should be.’ He was like, ‘I’m determined to make this happen.’ I said, ‘And that’s what I want you to do.’”

Get celeb fashion, beauty tips, and more delivered directly to your inbox. Sign up for the Us Weekly Style & Beauty newsletter now!