Swapping to 2D array, resolves #7