added a heap, orginized some inludes