Moved code to support the to header into a define, saved for later implementation