Things are starting to turn around for the most decorated Olympian of all time. After some issues with drinking, drugs, and the law, Micahel Phelps seems to be back on the straight and narrow (at least in terms of his love life). According to People, the swimmer asked his girlfriend Nichole Johnson (the former Miss California) to marry him! The couple first started dating in 2007 and have had an on-again, off-again relationship ever since. Phelps announced their good news with a snowy photo: A photo posted by Michael Phelps (@m_phelps00) on Feb 21, 2015 at 10:49pm PST Fellow Olympian Allison Schmitt, who is friends with the couple, posted her own snapshot of the "soon to be Mr. & Mrs. Phelps": A photo posted by Allison Schmitt (@arschmitty) on Feb 21, 2015 at 11:17pm PST And, Loverlies, they're just like us! Need to know more? Here's a closer look at their romance: They celebrate with selfies: A photo posted by Nicole Michele (@nicole.m.johnson) on Feb 22, 2015 at 10:50am PST They wear matching outfits: A photo posted by Michael Phelps (@m_phelps00) on Feb 14, 2015 at 10:12pm PST They go swimming together: A photo posted by Michael Phelps (@m_phelps00) on Feb 1, 2015 at 12:47pm PST They go out to the movies for date night: A photo posted by Nicole Michele (@nicole.m.johnson) on Nov 22, 2014 at 3:43pm PST They celebrate NYE with silly hats: A photo posted by Nicole Michele (@nicole.m.johnson) on Dec 31, 2014 at 9:40pm PST They have awkward photos from early on in their relationship: A photo posted by Nicole Michele (@nicole.m.johnson) on Dec 4, 2014 at 6:33pm PST They cheer for their favorite team together: A photo posted by Nicole Michele (@nicole.m.johnson) on Dec 28, 2014 at 2:50pm PST They play jokes on each other for the LOLz: A photo posted by Nicole Michele (@nicole.m.johnson) on Dec 25, 2014 at 7:07pm PST They take family photos at holiday gatherings: A photo posted by Nicole Michele (@nicole.m.johnson) on Nov 27, 2014 at 2:18pm PST They do adorable #fbf posts on Insta: A photo posted by Nicole Michele (@nicole.m.johnson) on Sep 19, 2014 at 1:18pm PDT Congrats to Michael and Nicole! We wonder if his crazy diet will change at all because of the wedding... [[hide_bundle_images: true]] [[wide_card_image_id: 1844416]] [[tall_card_image_id: 1844414]] [[square_card_image_id: 1844415]]