Added new files, and edited heaps