West Hollywood’s once-notorious San Vicente Inn is finally getting a long-anticipated makeover. Wehoville reports that after a few delays, construction is set to begin on a major renovation that will add three rooms, a restaurant, and off-site parking to the 29-unit establishment.

Historically known for its clothing-optional policy and liberal attitudes toward drug-use, the men-only hotel was a holdout of West Hollywood’s wilder past until Sunset Tower hotel owner Jeff Klein purchased it in 2013. Klein immediately evicted at least one meth dealer, eliminated the clothing-optional policy, and gave the hotel a temporary renovation—all while planning a more thorough transformation that will turn the gay countercultural landmark into an upscale boutique hotel.

Most of the rooms will be moved from the group of bungalows that comprise the hotel into a new building set to rise behind a historic post office across the street. That property was lumped into the sale when Klein bought the hotel (along with a rehab facility, of all things, that will stay put).

The bungalows themselves will be converted into the above-mentioned restaurant, a separate bar, and a handful of suites. Meanwhile, the Victorian-era post office building will become a reception area and lounge for guests.

The project’s future was briefly thrown into question when an attorney representing an unnamed client came forward to challenge its approval, maintaining that the planning department hadn’t followed California Environmental Quality Act guidelines. Partly thanks to the support of neighbors and community members, the appeal was eventually rejected.

With legal challenges out of the way, work on the inn will begin November 28, with construction expected to last about 18 months.