Completed most of refactor using new BinaryHeaps. Started re-write of unit tests.