Transport refactor

Refactored Transport to work with Proxy.