Splitting out the header functions into own module