[HECnet] Mapping - getting close