Aidan Shaw returned in the July 27 episode of And Just Like That, and he and Carrie made a big decision about their future.

Aidan quickly responded to Carrie’s email, and they made plans to meet for dinner on Valentine’s Day. Carrie was worried that too much time had passed since they last saw each other, but Aidan assured her that he was still interested.

Meanwhile, Charlotte was dealing with a series of mishaps. She fired all of her Hot Fellas workers for using steroids, and then she ate one of Lily’s pot brownies and had to be taken to the hospital.

Miranda also had a less-than-ideal Valentine’s Day. She went on a date with a woman named Amelia, but the date ended in disaster when Amelia stepped in cat poop.

Carrie and Aidan’s dinner went much better. They talked about their lives since they last saw each other, and they even kissed. However, when they got to Carrie’s apartment, Aidan couldn’t bring himself to go inside because of the bad memories associated with it.

Carrie understood, and they decided to go to a hotel instead. They ended the night by making love, and Carrie declared that she was “back on the same page” with Aidan.

Team Aidan fans, rejoice! It looks like these two are finally getting their happily ever after.

Here are some additional details from the episode:

• Charlotte’s friend Mark offered her a job at his law firm.
• Rock decided to quit modeling.
• Herbert Jr.’s girlfriend got kicked out of his house by Lisa.

Overall, it was a good episode for And Just Like That. The Aidan and Carrie storyline was particularly satisfying, and it will be interesting to see where their relationship goes from here.