Adding some heap stuff