Do OOP right
Fix _upHeap and fix oop once again