this will go away when splitting out UDP, right?