Revert "Revert "Tile map changes""

This reverts commit 37568e6952ffefe0f68eb8158d4876559794c6a8.