Feature/heaps