Redid client/net/connection, needs testing