Really fixed Heap this time + Added Timer class