moved all that header junk to a header helpers module. Added a test to the timestamp function