draft transport refactoring
Fixes