Trans ex changes

Note - haven't been able to run tests. Would be grateful for help if they fail.