Jdarwood007 ip headers option

This is just an attempt to solve the merge conflicts in #722