Let's try this again - added all header translation stuff

@b0d0nne11 @filler .  The other branch got messy.  Can you guys check this one out?
These changes are already in master. Can you rebase them out of the branch?