Need to convert everything to use heap