More WIP for datagram/udp support