Started reorganizing heap stuff