Sadly The way I see the situation finally being resolved will eventually involve Republicans not wanting to appear homophobic so they pass laws that cover sexual orientation only and do not mention gender identity at all Democrats are far too steeped in the SJW quicksand to ever consider doing this 