transport selection refactor

Closes #1724
// FREEBIE