Tunnels work.
Added a couple of todos