Some basic work done on the header
Staging changes here for now