Replaced min heap with a new hybrid minheap/hashmap which allows fast retrieval by key etc