Thinking of changing data structure to 2d array. No point. Going to roll back.