Add fluid transport. WIP