Added UDP connection handling, still kinda wonky