Need to rethink the hashing happening here.