Remove hash function and replace with 2d array