Trying to get surrounding tiles
Merge commit 'cf3b939c291551582ac1f9ecdea51c8c7a6daf82'