Added Edge and initial heap code