Testing some changes:
 * Simple TCP and UDP support
 * Simplification