Switched match() to return indices not points
Added map and grid adjacencies