Non-gender specific bathrooms have been around for a while now. I think it would be a simple fix to require a non-gender bathroom in any building that is licensed for business. A good number of large companies have already moved in that direction to begin with..