More work in progress to support UDP