working linkage of zones
Merge branch 'teleport'