Some more WIP with UDP