Diagrams, transport, etc. (wip)