Added more hashtable functionality, preparing heap