replace Isometric with Map and move logic around to avoid duplicity