Moving icmp in to its own class.