Would a good solution just be to make all bathrooms gender neutral, and use more private stalls with concierge service like they do in Japan?