added Tunneler - not quite perfect. suggestions?