Tile-mapping done and seems to work