Start of consolidating header code and appending new entries