redid heaps with header files and jazz