Cleaned up core, now using stable heaps from Hippie.