More work on IP, start on ICMP