Began refactoring to UDP