Ip headers

Well this looks right branch :P This'll fix the conflict stuff around..

:paw_prints: