Fixed the heap problem

Work towards assembling