Fleshed out structure for hash-table version

Still doesn’t count correctly, need to revise storage order.