Added some heap stuff. Not working