Changes to input and New Heap Class