 We've developed a process for retrofitting sex segregated restrooms that takes the multi-user approach a step further. First, we remove the plumbing stack wall and treat the bathroom as one open space. We then eliminate the corridor wall, treating the bathroom as the poorest extension of the hallway. We add three different types of fully enclosed stalls, standard, ambulatory, and ADA, as well as caregiving rooms which include sinks and changing tables. We add commutal grooming and washing stations off the circulation path and finally a lounge that transforms the corridor into an animated social space. This solution has three advantages. Restroom users can visually monitor one another, reducing the risk of violence. Gendered non-conforming people aren't stuck between two options that don't align with their identities. And it meets the needs of the trans community, as well as a wide range of differently embodied people including caregivers, the elderly, mothers, Muslims, and people with disabilities.