redid some of the system to use one hash table