wip/icmpchat/patches
